Removing merge marks