Removing merge markers