GitHub repository: HALLOWHANGER/Conflict-Demo
Description: GitHub class work showing us how to solve conflicts