feat: Added a conflict resolution dialog and a Conflicts view for easier management of conflicts (#2337)

yarn.lock

@@ -22,36 +22,36 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ariakit/core@npm:0.2.0":
-  version: 0.2.0
-  resolution: "@ariakit/core@npm:0.2.0"
-  checksum: f95e3db9ebb3a1b34ed8127f279c8d1a820ad04d42e59cb74b210df1bfb82bc7b5a3a2e965aeb089413015f2c7c573729230eb2e30494669c0a478a721aada3b
+"@ariakit/core@npm:0.2.4":
+  version: 0.2.4
+  resolution: "@ariakit/core@npm:0.2.4"
+  checksum: be795380e7c6379af66f4700fc8333c0253a24b4009f714070f20e49d355ea7ee9a7caa84bdfca65ffd4796e950607a2d57c9d75e4dfa69e8076ad7791917684
   languageName: node
   linkType: hard
 
-"@ariakit/react-core@npm:0.2.1":
-  version: 0.2.1
-  resolution: "@ariakit/react-core@npm:0.2.1"
+"@ariakit/react-core@npm:0.2.8":
+  version: 0.2.8
+  resolution: "@ariakit/react-core@npm:0.2.8"
   dependencies:
-    "@ariakit/core": 0.2.0
+    "@ariakit/core": 0.2.4
     "@floating-ui/dom": ^1.0.0
     use-sync-external-store: ^1.2.0
   peerDependencies:
     react: ^17.0.0 || ^18.0.0
     react-dom: ^17.0.0 || ^18.0.0
-  checksum: c10ba749afd48f16372bbed161587043dd1f97641b782f159031d4dafce71119b555403f99d71584e121b77b83d1f323578867119b08d779c49c34a22bab92f6
+  checksum: aeb94f4cb837fa534366f9a36b4fb430b4c46a54e256dbc11f25371ab618131d38877e16886094ecf91d734564cde53f69deb0649d1f413d16e639b55ca4cb8d
   languageName: node
   linkType: hard
 
-"@ariakit/react@npm:^0.2.1":
-  version: 0.2.1
-  resolution: "@ariakit/react@npm:0.2.1"
+"@ariakit/react@npm:^0.2.8":
+  version: 0.2.8
+  resolution: "@ariakit/react@npm:0.2.8"
   dependencies:
-    "@ariakit/react-core": 0.2.1
+    "@ariakit/react-core": 0.2.8
   peerDependencies:
     react: ^17.0.0 || ^18.0.0
     react-dom: ^17.0.0 || ^18.0.0
-  checksum: 55de2d395fa6a2ae3ef3b383f7559af155e177b9065fe07b8baf8984689bc2ad0bb8531aac1c97ad2ca388c5cf3199b3407ffe3f292533d076bfd0613405d3d3
+  checksum: 8d974628e8a7ef34bb079d3fb94a5ece3bcf8d2e3bbcbd1f7f597f2599fa35a9a22b8a5acb3dd2863bd5ab590577f58a8be619b14889a5a28bd0bf0999c73dad
   languageName: node
   linkType: hard
 
@@ -4760,7 +4760,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@standardnotes/web@workspace:packages/web"
   dependencies:
-    "@ariakit/react": ^0.2.1
+    "@ariakit/react": ^0.2.8
     "@babel/core": "*"
     "@babel/plugin-proposal-class-properties": ^7.18.6
     "@babel/plugin-transform-react-jsx": ^7.19.0
@@ -4812,6 +4812,7 @@ __metadata:
     eslint-config-prettier: ^8.5.0
     eslint-plugin-react: ^7.31.11
     eslint-plugin-react-hooks: ^4.6.0
+    fast-diff: ^1.3.0
     identity-obj-proxy: ^3.0.0
     jest: ^29.3.1
     jest-environment-jsdom: ^29.3.1
@@ -11034,6 +11035,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"fast-diff@npm:^1.3.0":
+  version: 1.3.0
+  resolution: "fast-diff@npm:1.3.0"
+  checksum: d22d371b994fdc8cce9ff510d7b8dc4da70ac327bcba20df607dd5b9cae9f908f4d1028f5fe467650f058d1e7270235ae0b8230809a262b4df587a3b3aa216c3
+  languageName: node
+  linkType: hard
+
 "fast-glob@npm:^2.2.6":
   version: 2.2.7
   resolution: "fast-glob@npm:2.2.7"