Make some changes in ConflictTracker listener.