diff --git a/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786607100.json b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786607100.json
new file mode 100644
index 00000000..1480337d
--- /dev/null
+++ b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786607100.json
@@ -0,0 +1,10 @@
+{
+  "id": "3487a977-1ff7-4ce3-af79-5643f067cea5",
+  "name": "oev-123",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQH1qzWKcNcD7uH2achrvr+byQSQSJdCq1mav0vxGi8jpaJa"
+  },
+  "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_1786607100.json b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786607100.json
new file mode 100644
index 00000000..98a73aff
--- /dev/null
+++ b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786607100.json
@@ -0,0 +1,13 @@
+{
+  "id": "7db2f101-b275-4525-bff3-e09a7a2ffbff",
+  "name": "oev-private",
+  "auth_method": {
+    "type": "private_key",
+    "private_key": "ENC:v1:U1RSTQEMrmViIpwuFXOJTQDcjp2O6c+AnXv2u+LArOn42sJpUiyVsi9szPZzumo2OWRu+9B59AStSqGrVbBQcxaYDEQAjmbBGjzcF8G+gAQ/VawvQk/n1yOb+vqQRZKqMkVIDtI5AyYbyRMbGOdIoDO+zUj+yFbkDZMjppN+V+Fh4dJ0bZ6908u0W3hUVSEC3GokOHTmi6tQtexu325IPD05jJ5QIaVrf7XF2Qsl3tQXpyQiXMkrA1XhYcZGazzIGb1Srol4aRXtKAoFIK9m8pQsrixtDXyoPwBacU2/g/m+7woyPjS22o+WCi2liaeUZD960cmaDiGM2tSYeS4733J5ZJMo/eV5cgFgP129qcTRhmUlLzatW/GsNAt3JCkuJFWoK64geTYv7ONprrvyHtDDbVRp/VRxRm6CbqNsfhfspmWOu5hZ7It0wsitP2Nmi8d+P6/qjFF0TFmXW+qqP43jo2SqlFU98GWC3Uk4NdXteIj3lG2hBHX3uW2PlxPiyvctYDo2UNmBg5XyOAgnldXS/6EqBuZRbdon1e1jbBcJ2eYKFFSiOrThNobwHMQ1Mz+gaICSdiY3Mol4",
+    "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_1786607100.json b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786607100.json
new file mode 100644
index 00000000..e42eb1ed
--- /dev/null
+++ b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786607100.json
@@ -0,0 +1,10 @@
+{
+  "id": "81915847-1a38-40df-8abf-c80601af2708",
+  "name": "oev-2025",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQEYVSr/9WsOY3hBnvJGBexYCFgGKMy+syiUkH3/FZl0s3eVwrs="
+  },
+  "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_1786607100.json b/backups/conflicts/sync_meta_conflict_1786607100.json
new file mode 100644
index 00000000..81745113
--- /dev/null
+++ b/backups/conflicts/sync_meta_conflict_1786607100.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 1480337d..51248ed9 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:U1RSTQH1qzWKcNcD7uH2achrvr+byQSQSJdCq1mav0vxGi8jpaJa"
+    "password": "ENC:v1:U1RSTQFKIf4rBV+ZKZ29nmPF6oJNVcaFuAGuGUpgKwV9UUqonx3J"
   },
   "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 98a73aff..a6a001bb 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:U1RSTQEMrmViIpwuFXOJTQDcjp2O6c+AnXv2u+LArOn42sJpUiyVsi9szPZzumo2OWRu+9B59AStSqGrVbBQcxaYDEQAjmbBGjzcF8G+gAQ/VawvQk/n1yOb+vqQRZKqMkVIDtI5AyYbyRMbGOdIoDO+zUj+yFbkDZMjppN+V+Fh4dJ0bZ6908u0W3hUVSEC3GokOHTmi6tQtexu325IPD05jJ5QIaVrf7XF2Qsl3tQXpyQiXMkrA1XhYcZGazzIGb1Srol4aRXtKAoFIK9m8pQsrixtDXyoPwBacU2/g/m+7woyPjS22o+WCi2liaeUZD960cmaDiGM2tSYeS4733J5ZJMo/eV5cgFgP129qcTRhmUlLzatW/GsNAt3JCkuJFWoK64geTYv7ONprrvyHtDDbVRp/VRxRm6CbqNsfhfspmWOu5hZ7It0wsitP2Nmi8d+P6/qjFF0TFmXW+qqP43jo2SqlFU98GWC3Uk4NdXteIj3lG2hBHX3uW2PlxPiyvctYDo2UNmBg5XyOAgnldXS/6EqBuZRbdon1e1jbBcJ2eYKFFSiOrThNobwHMQ1Mz+gaICSdiY3Mol4",
+    "private_key": "ENC:v1:U1RSTQGtOojUl/qxkD6u5jmaSvTei82B1sej4X9/4v85Zx1eMAVVC8XyK768kSDxf6cnVTjvpXkfR3lo2FWVGwgeFp7MtsvOZd9htDQKGvFHuMxVXEvw+V2xVO1AOVNUSwBvNkrSUK7T1MN/IHvusQ/nFLh7SgASPokAWclrffUkC0sXdH9dFaaXpBAzg1rIW16mHW3C5AO05jdVukJThsH6uItQQZbyVyZvXR7xACilGASkAICdiy/RX+qiHTraUcm0o10vC+Ao1q7vuQQFCA5nUjZP4Kk03zuKRlO4jGlczfom/XCKskl2loBFjFYYClOCiWoFPDwv293UEcPrKwL1xDkn8HAVRhKY0ksg5VYRev4l9rpsyi3gmuMt1Jup0hl8qkzHlGu6dxYMx2xriuE9RXjPHpCR4CQNu1ZTxkulYkIU3W5rkWG0xirjIrktUizpsUhBXuhhfcRGNFAHXDTJgh+feFnH7gm1N1k0Epi6PQbCA9Q16Z5xglLOtExFyP/t+Eyscs6ahAby2ykSLzqOCMmSXHPyBN5lxNsKD70vL9o6l3TMT+FykcMU4H7pu8WMvUwU8WvOIu1S",
     "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 e42eb1ed..cc688619 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:U1RSTQEYVSr/9WsOY3hBnvJGBexYCFgGKMy+syiUkH3/FZl0s3eVwrs="
+    "password": "ENC:v1:U1RSTQFoW5AnzzK1TEw53Hx+6cshgZ9ORvR3/5uELhzVIjk7Biy5qEw="
   },
   "created_at": "2026-08-13T04:15:22.425983+00:00",
   "updated_at": "2026-08-13T04:15:22.425983+00:00"