Cleaned merge stuff.

It seems there is a limit to what diff and git are capable of; don't
be working on the same file across two different computers.