Fix a conflict resolution error.