Removes merge conflict markers