fixes #6348 add additional location conflict stats
Merge branch 'redistricting' into prod