The magic of merging - GirlsOfSteelRobotics/2015season GitHub Wiki

A merge conflict happens when you and someone else change the same thing at the same time.