Fixing bugs in Conflict Tracker