Rewrite of Conflict Tracker