Title: conflict and reconciliation