svn merge is shit