Quick Conflict Resolution