git merging part 2