merge with SVN