Fix some sort of Merge or Revert errors.

I thought that Git was supposed to solve all this bollocks. :-|