Solving Merge Conflicts Part 2