Changed Git_merging_part1