Exercise: Resolve Merge Conflicts - View it on GitHub