commit the rest of my svnmerge