Merge svn changes