faster update conflict resolution