diff --git a/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786605621.json b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786605621.json
new file mode 100644
index 00000000..46495b30
--- /dev/null
+++ b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786605621.json
@@ -0,0 +1,10 @@
+{
+  "id": "3487a977-1ff7-4ce3-af79-5643f067cea5",
+  "name": "oev-123",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQEXlwURIzMl/MMXcfOwfQ+S8NU1I3FL+K/BJ7nPTVNPPakH"
+  },
+  "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_1786605621.json b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786605621.json
new file mode 100644
index 00000000..ebb03cc3
--- /dev/null
+++ b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786605621.json
@@ -0,0 +1,13 @@
+{
+  "id": "7db2f101-b275-4525-bff3-e09a7a2ffbff",
+  "name": "oev-private",
+  "auth_method": {
+    "type": "private_key",
+    "private_key": "ENC:v1:U1RSTQH3SGyXVMq+L/V/VNJdDDB5AzxTrTPUyu118aUzPuda7+NlBLCqRSLPqDssUvk3T6PPmWrlxdsiAnosBdaenPTNqRZ37pIiL2Bi8CTX1OQknZIBe4XT3/NRKthvkUKi3wwHMvAScDksUIUGfDHzAIYLz28Izd3EHtCRpxQWsnIOoBePvNbceVbS59l0WUBmpduNqedAb8Oxah11QOnqhmYvFwHIDlsnFNnUxWGe8dPnlXjY34gjXGKx9PMyIqS/oBpgkuTFjwFG4FwN3c/jGwajkYQMb+s+pt2rE6FGXsKaVZQr6webFJ7lLY4r5YJIKmvKd1UrdK8s5Ma3laFKo8Q0P2wMp+eZCzV1k/Wvc72od75ndyJRgqeXfFlibPdaCDt1WT6+hltzJHWl5s+barYRNUhs4wDV/kMshpUjhe/tISwWsUFq3wBqhrGJiDmOmFiYSEUwHhT83GCF+beZrtFkW2jKIBv2ytA3vOkJjt0Rpb9lC/OmOjv6hbPx2vSaRRr6AQJFjfXN1YjqVjRSCxzgtv9QD5d6a8V2dqUtDaf/X46mZ7T7rdZrgOGUu/0UxSjTCNc45n1l",
+    "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_1786605621.json b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786605621.json
new file mode 100644
index 00000000..bbc944cc
--- /dev/null
+++ b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786605621.json
@@ -0,0 +1,10 @@
+{
+  "id": "81915847-1a38-40df-8abf-c80601af2708",
+  "name": "oev-2025",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQFzA55r44rmK3cKj6/4AIGpM+P73R3L6uP7UvQjK+2aqRvSeqI="
+  },
+  "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_1786605621.json b/backups/conflicts/sync_meta_conflict_1786605621.json
new file mode 100644
index 00000000..3737a323
--- /dev/null
+++ b/backups/conflicts/sync_meta_conflict_1786605621.json
@@ -0,0 +1,4 @@
+{
+  "last_sync": "2026-08-13T07:20:21.149310+00:00",
+  "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 46495b30..f7db2259 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:U1RSTQEXlwURIzMl/MMXcfOwfQ+S8NU1I3FL+K/BJ7nPTVNPPakH"
+    "password": "ENC:v1:U1RSTQEOwS+vtpkCP5qTvjKvzki7RyvysIt7Msl6P3posGGdpHcR"
   },
   "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 ebb03cc3..e1f49700 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:U1RSTQH3SGyXVMq+L/V/VNJdDDB5AzxTrTPUyu118aUzPuda7+NlBLCqRSLPqDssUvk3T6PPmWrlxdsiAnosBdaenPTNqRZ37pIiL2Bi8CTX1OQknZIBe4XT3/NRKthvkUKi3wwHMvAScDksUIUGfDHzAIYLz28Izd3EHtCRpxQWsnIOoBePvNbceVbS59l0WUBmpduNqedAb8Oxah11QOnqhmYvFwHIDlsnFNnUxWGe8dPnlXjY34gjXGKx9PMyIqS/oBpgkuTFjwFG4FwN3c/jGwajkYQMb+s+pt2rE6FGXsKaVZQr6webFJ7lLY4r5YJIKmvKd1UrdK8s5Ma3laFKo8Q0P2wMp+eZCzV1k/Wvc72od75ndyJRgqeXfFlibPdaCDt1WT6+hltzJHWl5s+barYRNUhs4wDV/kMshpUjhe/tISwWsUFq3wBqhrGJiDmOmFiYSEUwHhT83GCF+beZrtFkW2jKIBv2ytA3vOkJjt0Rpb9lC/OmOjv6hbPx2vSaRRr6AQJFjfXN1YjqVjRSCxzgtv9QD5d6a8V2dqUtDaf/X46mZ7T7rdZrgOGUu/0UxSjTCNc45n1l",
+    "private_key": "ENC:v1:U1RSTQFd+fS+6JjGY43PRV0igqdP0XX5U1k+V2/PXDTisxu80XUqL+nEqzpKaquNdrzHrJ+Ohw8/WsVunyRuXDPsP4w5QotbdHPySBGaV0sUV3eIxkKCkqPpUXvLa1BYlRs0gn+OXEcQKLN06WjSQYPffWdt5/SJkIsdnmp1rHo5MH/qBsvw8At5zuY/aN0PS3bITuevguineb4QtGnh1ZjiDPOOXAi6Qv+Vrv4VxHdxdUb0O2inphVT5yvseoim2WyP5bl6koud5mz6YfdJ8aCct4TB+I+TYekhUF9yg7LeyalYAcGsGCH2vgFBd0cTCUjjr9O44c7nEGbskFMgoSeFcBM4xYSsJP3MT0t6QlT3e5ionUyzaNQWGsxRqHzQfNhKWczBX/ZRpijvObHM0JWmfIhZkWG6tqiLqdxnRD647uwA2h+WPNkOoY52YdtoMC+qa8yFJbnjH4R+r7IfdkeC/s/nvtRO0oLJpcqo2rpZ/IkEa0rp/Jp5GFu5CwMiovllmaSVrKmGQushJrlr8RCi/8vKawIWQqZNTfL4BZ9qlTXCFNE82CWYGh6wk+qab+7SKwPGQvj37DAD",
     "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 bbc944cc..9fa493b9 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:U1RSTQFzA55r44rmK3cKj6/4AIGpM+P73R3L6uP7UvQjK+2aqRvSeqI="
+    "password": "ENC:v1:U1RSTQGHyN3RrEESEUN/cPjo7EYA/mMfHanwNxQzhx9LqUC1GRPlELs="
   },
   "created_at": "2026-08-13T04:15:22.425983+00:00",
   "updated_at": "2026-08-13T04:15:22.425983+00:00"
diff --git a/sync_meta.json b/sync_meta.json
index 3737a323..6541ca9f 100644
--- a/sync_meta.json
+++ b/sync_meta.json
@@ -1,4 +1,4 @@
 {
-  "last_sync": "2026-08-13T07:20:21.149310+00:00",
+  "last_sync": "2026-08-13T07:21:11.929408+00:00",
   "version": 1
 }
\ No newline at end of file