Actually fix the merge.