My attempt to merge my git svn clone with the other CB Git Repo.