svn manual merge.