correcting merge differences