Resolve conflicts

lib/Onyx.ts

@@ -427,7 +427,7 @@ function merge<TKey extends OnyxKey>(key: TKey, changes: OnyxMergeInput<TKey>):
  * @param collection Object collection keyed by individual collection member keys and values
  */
 function mergeCollection<TKey extends CollectionKeyBase, TMap>(collectionKey: TKey, collection: OnyxMergeCollectionInput<TKey, TMap>): Promise<void> {
-    // Gracefully handle bad mergeCollection updates so it doesn't block the merge queue
+    // Gracefully handle bad mergeCollection updates, so it doesn't block the merge queue
     if (!OnyxUtils.isValidMergeCollection(collectionKey, collection)) {
         return Promise.resolve();
     }

lib/OnyxUtils.ts

@@ -23,6 +23,7 @@ import type {
     OnyxEntry,
     OnyxInput,
     OnyxKey,
+    OnyxMergeCollectionInput,
     OnyxValue,
     Selector,
     WithOnyxConnectOptions,
@@ -1112,7 +1113,7 @@ function initializeWithDefaultKeyStates(): Promise<void> {
 /**
  * Verify if the collection is valid for merging into the collection key using mergeCollection()
  */
-function isValidMergeCollection<TKey extends CollectionKeyBase, TMap>(collectionKey: TKey, collection: Collection<TKey, TMap, NullishDeep<KeyValueMapping[TKey]>>): boolean {
+function isValidMergeCollection<TKey extends CollectionKeyBase, TMap>(collectionKey: TKey, collection: OnyxMergeCollectionInput<TKey, TMap>): boolean {
     if (typeof collection !== 'object' || Array.isArray(collection) || utils.isEmptyObject(collection)) {
         Logger.logInfo('mergeCollection() called with invalid or empty value. Skipping this update.');
         return false;

lib/types.ts

@@ -436,8 +436,8 @@ type GenericFunction = (...args: any[]) => any;
  * Represents a combination of Merge and Set operations that should be executed in Onyx
  */
 type MixedOperationsQueue = {
-    merge: NullableKeyValueMapping;
-    set: NullableKeyValueMapping;
+    merge: OnyxInputKeyValueMapping;
+    set: OnyxInputKeyValueMapping;
 };
 
 export type {