Finished manual merge.
I'm running out of variations of "I hate merge" commit messages.