merging SVN