Fix a merge resolution error