... I should stop pressing buttons

GitHub isn't very helpful with conflicts and mismatched versions... Not
in comparison to something like SVN stuff...