fixing merge differences