Changes from another local git-2