simplify conflict analysis of PB constraints
Merge branch 'simplify-pb-conflict-analysis'