Fixing the results of a merge error. Fuck vimdiff, seriously.