Merging Git's code