Fix a conflict