1.9: Resolving Merge Conflicts - Git and GitHub for Poets