SVN changes merged into git