Merging with git