resolveConflict & updateFromDelta