fix merge markers