Title: Rethinking Conflict Resolution and Management