Fucking git...

...Remind me to *NEVER* attempt at merging conflicting branches because
all hell will break loose.