Protocol-based Conflict Resolution