Fix a trivial merge conflict