Conflict Resolution & Reporting