manually merge changes from svn