Fix a Pull Request that has a Merge Conflict by Chris Achard