Remove Merge marks