Merge "Output number of conflicts"