Fix a missing merge conflict