Make more changes to the ConflictTracker listener.