Conflict tracker scan added
Conflicts scan added