tidy conflict indicators

to review, reconcile