fix missed merge markers