Fixed merge markers in a file