Remove svn merge marker