diff --git a/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786608611.json b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786608611.json
new file mode 100644
index 00000000..196bb1cf
--- /dev/null
+++ b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786608611.json
@@ -0,0 +1,10 @@
+{
+  "id": "3487a977-1ff7-4ce3-af79-5643f067cea5",
+  "name": "oev-123",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQF20g1grAeIGyCQoJB5Brkb4FMQ5gGvTCc0EAcuW2RMpcv2"
+  },
+  "created_at": "2026-08-13T04:15:02.456656+00:00",
+  "updated_at": "2026-08-13T04:15:02.456656+00:00"
+}
\ No newline at end of file
diff --git a/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786608611.json b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786608611.json
new file mode 100644
index 00000000..11d2683c
--- /dev/null
+++ b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786608611.json
@@ -0,0 +1,13 @@
+{
+  "id": "7db2f101-b275-4525-bff3-e09a7a2ffbff",
+  "name": "oev-private",
+  "auth_method": {
+    "type": "private_key",
+    "private_key": "ENC:v1:U1RSTQER1ps/+RlfkBD7GYdzsbF6q9BI+UhoE+M8/d5p290+3Yna6L6uV8E3i/mWMfc1Dxq5xJTBejLecBQTCTLDuOq1yFpcvVn2bWTy9QLz9SC58qvaqliF7ttXdsd9wVDEP7Yn+JG165uwol1Daux93wG+zZ0lRxOfZbQxf2p/CWklddZrCpl7T/lQ3SgwkEoW9dwFJIhB7ohtBoSIdDXxpQx6vikaaZk/gRl58XfD7kzrqJgscGNaXlWoE4plNfYZRvbMnbxhJBLuDKwDqYuHlcbvZl/RPElAJFqGNm4OVFdae+9B8zngBYMaRWMyzV/otAndgSXocQ3GENVqP1PT32sZ6VzDg9a77lpmN6F3MWrBiPjyTI3qdVuMpBUIxCVltlu+fWHW5Zoi/LWjkgzid/ugC5sxVUxD37SaOhahD2Lq+3zjtXWh8HvDRiKsA7urHdT8AKwDHrPWSTWoB8YSLqoVkG2ReROreFTahcsok0QlCQb844XKr08vP8DtFSFDyCcZ3ph2GeckcZCG9uYvo+NgA6CD3Ij2d7JOtRx/FrUgMLoZEWCH9boDBSqYfc/qgMy6KJWJT+z8",
+    "passphrase": null,
+    "key_type": null,
+    "fingerprint": null
+  },
+  "created_at": "2026-08-13T04:11:59.658692+00:00",
+  "updated_at": "2026-08-13T04:11:59.658692+00:00"
+}
\ No newline at end of file
diff --git a/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786608611.json b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786608611.json
new file mode 100644
index 00000000..cbeb7f6a
--- /dev/null
+++ b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786608611.json
@@ -0,0 +1,10 @@
+{
+  "id": "81915847-1a38-40df-8abf-c80601af2708",
+  "name": "oev-2025",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQGkVli7a6ca6ehp0UVl76r+qn3iHt8y1ByGrwAWjT1q4oDmJ38="
+  },
+  "created_at": "2026-08-13T04:15:22.425983+00:00",
+  "updated_at": "2026-08-13T04:15:22.425983+00:00"
+}
\ No newline at end of file
diff --git a/backups/conflicts/sync_meta_conflict_1786608611.json b/backups/conflicts/sync_meta_conflict_1786608611.json
new file mode 100644
index 00000000..81745113
--- /dev/null
+++ b/backups/conflicts/sync_meta_conflict_1786608611.json
@@ -0,0 +1,3 @@
+{
+  "version": 1
+}
\ No newline at end of file
diff --git a/identities/3487a977-1ff7-4ce3-af79-5643f067cea5.json b/identities/3487a977-1ff7-4ce3-af79-5643f067cea5.json
index 196bb1cf..84014ab6 100644
--- a/identities/3487a977-1ff7-4ce3-af79-5643f067cea5.json
+++ b/identities/3487a977-1ff7-4ce3-af79-5643f067cea5.json
@@ -3,7 +3,7 @@
   "name": "oev-123",
   "auth_method": {
     "type": "password",
-    "password": "ENC:v1:U1RSTQF20g1grAeIGyCQoJB5Brkb4FMQ5gGvTCc0EAcuW2RMpcv2"
+    "password": "ENC:v1:U1RSTQF0uEweiHhtcR1/u9NuCyWfJig/qHgPmRoyBS/vdgYbSaag"
   },
   "created_at": "2026-08-13T04:15:02.456656+00:00",
   "updated_at": "2026-08-13T04:15:02.456656+00:00"
diff --git a/identities/7db2f101-b275-4525-bff3-e09a7a2ffbff.json b/identities/7db2f101-b275-4525-bff3-e09a7a2ffbff.json
index 11d2683c..06aea6e9 100644
--- a/identities/7db2f101-b275-4525-bff3-e09a7a2ffbff.json
+++ b/identities/7db2f101-b275-4525-bff3-e09a7a2ffbff.json
@@ -3,7 +3,7 @@
   "name": "oev-private",
   "auth_method": {
     "type": "private_key",
-    "private_key": "ENC:v1:U1RSTQER1ps/+RlfkBD7GYdzsbF6q9BI+UhoE+M8/d5p290+3Yna6L6uV8E3i/mWMfc1Dxq5xJTBejLecBQTCTLDuOq1yFpcvVn2bWTy9QLz9SC58qvaqliF7ttXdsd9wVDEP7Yn+JG165uwol1Daux93wG+zZ0lRxOfZbQxf2p/CWklddZrCpl7T/lQ3SgwkEoW9dwFJIhB7ohtBoSIdDXxpQx6vikaaZk/gRl58XfD7kzrqJgscGNaXlWoE4plNfYZRvbMnbxhJBLuDKwDqYuHlcbvZl/RPElAJFqGNm4OVFdae+9B8zngBYMaRWMyzV/otAndgSXocQ3GENVqP1PT32sZ6VzDg9a77lpmN6F3MWrBiPjyTI3qdVuMpBUIxCVltlu+fWHW5Zoi/LWjkgzid/ugC5sxVUxD37SaOhahD2Lq+3zjtXWh8HvDRiKsA7urHdT8AKwDHrPWSTWoB8YSLqoVkG2ReROreFTahcsok0QlCQb844XKr08vP8DtFSFDyCcZ3ph2GeckcZCG9uYvo+NgA6CD3Ij2d7JOtRx/FrUgMLoZEWCH9boDBSqYfc/qgMy6KJWJT+z8",
+    "private_key": "ENC:v1:U1RSTQF8t01CYLul6T1ZYpH0UgtwCe1pS4qSKdednAZY6We5/WVPZNzISeoMd4NzK96ZqdC7mBfFa2RctpXWXNZk28qS8RFOcM/GKR2VU7Cwt3ImTtUxF4Y9BtGqkzLAM+4lhTedlurmJOGagc6EOaIhoPQXwgsvwmw2yB54BHKVoCfJer36ZXprj3WnWbRX3vfz+HfibKl2fAw2W8+d0gqqoEjSoRhacTVn9G8hjj9bYPX6mdeB+grLXVvgqRIbxAWl6+E/XPlhkaWtoIH48XhVzyc5poewbEIHXIUmilVxnjCSEQl1wzzlLFE+ovr/lfWijhkqCcZoUZhD47oeUWYPeQ2x/mSNyEVKTYXQ/5LwuKePaLoxYoBLZWaVxSbvREIQXy723OSpld5YBrK2vdXC24YcMfBg9JOI39FaLqyJX+x6QHcWpkyN+VT/Xy9WF0T4gYEojp0APzIiwfPVybtpHlBPdTDpv0faGSLRpX6mwzWQhQaUyGnHKrBWumNCyTELvoT5pDV5i3OT6nKDzQOtWPVZ1WKMyfoh3bcQ2s3IT5FIFqkZFcHByAFJMOIHhygBjyNnemFYAqhC",
     "passphrase": null,
     "key_type": null,
     "fingerprint": null
diff --git a/identities/81915847-1a38-40df-8abf-c80601af2708.json b/identities/81915847-1a38-40df-8abf-c80601af2708.json
index cbeb7f6a..a2473ae6 100644
--- a/identities/81915847-1a38-40df-8abf-c80601af2708.json
+++ b/identities/81915847-1a38-40df-8abf-c80601af2708.json
@@ -3,7 +3,7 @@
   "name": "oev-2025",
   "auth_method": {
     "type": "password",
-    "password": "ENC:v1:U1RSTQGkVli7a6ca6ehp0UVl76r+qn3iHt8y1ByGrwAWjT1q4oDmJ38="
+    "password": "ENC:v1:U1RSTQHzzJaCogCaDqkEFbyP0GN5E96a+475mw8i2A9+OWMGqZsavOA="
   },
   "created_at": "2026-08-13T04:15:22.425983+00:00",
   "updated_at": "2026-08-13T04:15:22.425983+00:00"