Remove merge markers