Merge conflicts are fun.

I honestly hate the way merges can undo work like that.