Correcting error from earlier merge conflict fix