How Do I Git? Three Ways to Solve a Merge Conflict…