diff --git a/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786608309.json b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786608309.json
new file mode 100644
index 00000000..75b453c3
--- /dev/null
+++ b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786608309.json
@@ -0,0 +1,10 @@
+{
+  "id": "3487a977-1ff7-4ce3-af79-5643f067cea5",
+  "name": "oev-123",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHu2w6Y7Ol7tGlqjYctX8XEXqClQIakfeZiMq5MWOi/IGdR"
+  },
+  "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_1786608309.json b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786608309.json
new file mode 100644
index 00000000..a0a9688a
--- /dev/null
+++ b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786608309.json
@@ -0,0 +1,13 @@
+{
+  "id": "7db2f101-b275-4525-bff3-e09a7a2ffbff",
+  "name": "oev-private",
+  "auth_method": {
+    "type": "private_key",
+    "private_key": "ENC:v1:U1RSTQE3DmMegsd71Mt3D2a108tfWn0aiSu41kevUy6pDDobEj0+hwMtJrw0goQuI+ZicunKCQWCu3gR8+tskWH9ellzA5jykp0D3gEgUVEXkqBau76tTouhUHBUEb9QAbjD2Vg9YWqqsNXopedyoJMTEbNrFqZkQ1vvpHC8QaacEf/1BJac6G1TyZwUFKkbaYIQbYYWN7xC4jeDc+J6yPZFSirBG66Ai35HskX0cM/9n4JWK+2WL3mQX689kNVr5Y12Gxs4QsJRAec1MZL8NGle4YHuoJwZAkyMnQ34lAUQxq6AOQ9HDUBlt7xT5B3FT/YYuH9W5LxtNHVzMO+98cMV/dvcrp7f8dhKtlRSj74VNxTe82Ryw2x1t/5bGF+8tYWxvEQRCMEEzltSYec6nnZwzTCtqcGsJS1V0oGvp44aG1Cr9ZTJmLzfAFQif0Cyk80I0/TaWuEAwxMGSW3bSgfnWspNgcha135sfq31MQCUL9IXQAyO+dhwGEQgHUq5eqyfJLnKYIi7bFCS8p7zWZfNaj1LxSDjt3cm05C3YHJEy4M6zJGFmJKcPFN0jwo/IG5iDI9+eA6dbU7A",
+    "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_1786608309.json b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786608309.json
new file mode 100644
index 00000000..0064e59c
--- /dev/null
+++ b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786608309.json
@@ -0,0 +1,10 @@
+{
+  "id": "81915847-1a38-40df-8abf-c80601af2708",
+  "name": "oev-2025",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHfTaKLcIY5cIXdMoKFC9tCNuYBgk/KOJ1m0nvIl0NaYLJB64o="
+  },
+  "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_1786608309.json b/backups/conflicts/sync_meta_conflict_1786608309.json
new file mode 100644
index 00000000..81745113
--- /dev/null
+++ b/backups/conflicts/sync_meta_conflict_1786608309.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 75b453c3..196bb1cf 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:U1RSTQHu2w6Y7Ol7tGlqjYctX8XEXqClQIakfeZiMq5MWOi/IGdR"
+    "password": "ENC:v1:U1RSTQF20g1grAeIGyCQoJB5Brkb4FMQ5gGvTCc0EAcuW2RMpcv2"
   },
   "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 a0a9688a..11d2683c 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:U1RSTQE3DmMegsd71Mt3D2a108tfWn0aiSu41kevUy6pDDobEj0+hwMtJrw0goQuI+ZicunKCQWCu3gR8+tskWH9ellzA5jykp0D3gEgUVEXkqBau76tTouhUHBUEb9QAbjD2Vg9YWqqsNXopedyoJMTEbNrFqZkQ1vvpHC8QaacEf/1BJac6G1TyZwUFKkbaYIQbYYWN7xC4jeDc+J6yPZFSirBG66Ai35HskX0cM/9n4JWK+2WL3mQX689kNVr5Y12Gxs4QsJRAec1MZL8NGle4YHuoJwZAkyMnQ34lAUQxq6AOQ9HDUBlt7xT5B3FT/YYuH9W5LxtNHVzMO+98cMV/dvcrp7f8dhKtlRSj74VNxTe82Ryw2x1t/5bGF+8tYWxvEQRCMEEzltSYec6nnZwzTCtqcGsJS1V0oGvp44aG1Cr9ZTJmLzfAFQif0Cyk80I0/TaWuEAwxMGSW3bSgfnWspNgcha135sfq31MQCUL9IXQAyO+dhwGEQgHUq5eqyfJLnKYIi7bFCS8p7zWZfNaj1LxSDjt3cm05C3YHJEy4M6zJGFmJKcPFN0jwo/IG5iDI9+eA6dbU7A",
+    "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
diff --git a/identities/81915847-1a38-40df-8abf-c80601af2708.json b/identities/81915847-1a38-40df-8abf-c80601af2708.json
index 0064e59c..cbeb7f6a 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:U1RSTQHfTaKLcIY5cIXdMoKFC9tCNuYBgk/KOJ1m0nvIl0NaYLJB64o="
+    "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"