Git merging exercise