Polish conflict script.
Splitting out conflict script.
Find conflicts between all branch pairs.