merged git repo with existing files