merged svn and git