From 673c22f04e00fc9cf99efed27e0cb7a84897dde5 Mon Sep 17 00:00:00 2001
From: Andrew Lamb <andrew@nerdnetworks.org>
Date: Thu, 21 Jul 2022 16:14:49 -0400
Subject: [PATCH] Fix logical merge conflict

---
 integration-testing/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/integration-testing/src/lib.rs b/integration-testing/src/lib.rs
index cd3033bbb87f..953427035932 100644
--- a/integration-testing/src/lib.rs
+++ b/integration-testing/src/lib.rs
@@ -642,7 +642,7 @@ fn array_from_json(
                                 .unwrap();
                         b.append_value(&decimal)
                     }
-                    _ => b.append_null(),
+                    _ => Ok(b.append_null()),
                 }?;
             }
             Ok(Arc::new(b.finish()))