Git Merging Exercise