remove lagging merge conflict string