remove merge markers