merge svn changes