Per 3: Conflict Resolution