Added git svn branch and merge