Local Conflict Resolution