Fix a bug in ConflictTracker