removed merge markers