Minor changes in ConflictTracker