Correcting earlier merge change