Really fix the merge conflict this time