Git Merging Exercise II