fix merge conflicts

packages/client/manifest.json

@@ -2151,7 +2151,7 @@
           "setting": "optionsSource",
           "value": "provider"
         }
-      },
+      }, 
       {
         "type": "options",
         "key": "customOptions",

packages/server/src/db/tests/linkTests.spec.js

@@ -59,4 +59,4 @@ describe("test link functionality", () => {
       expect(Array.isArray(output)).toBe(true)
     })
   })
-})
+})