Removed merge-marks