Prepare conflict analysis for next improvement
Improve conflict analysis to avoid some false positives