GIT... Stahp... Why you be stupid...?

Removing git merge stuff.