diff --git a/yarn.lock b/yarn.lock
index 52cc3a180c..4eb3765615 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3918,10 +3918,13 @@
 <<<<<<< HEAD
 =======
 
+<<<<<<< HEAD
 "@nymproject/contract-clients@file:sdk/typescript/codegen/contract-clients":
   version "1.3.0-rc.0"
 >>>>>>> 2b303d2bd (fix build)
 
+=======
+>>>>>>> e3885b9fe (allow node select from table)
 "@nymproject/mix-fetch-node-commonjs@^1.2.1-rc.2":
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/@nymproject/mix-fetch-node-commonjs/-/mix-fetch-node-commonjs-1.2.3.tgz#9c917cafb6c3d0dcc87a427e1d1c7193a12fb986"