Me, six months ago:
Git is a difficult thing to understand, and without GitHub it must be even more difficult to understand.
Me, now:
Git makes perfect sense. Everything difficult-to-understand about it is GitHub-specific.
@Sandra i have no way to verify whether that's true or not so I'll just have to conclude you're right & a genius
So git log to find the hash just before the merge and then git reset that hash.