Modifying conflict tracker