Actually fix the merge conflict