Remove merge marks