diff --git a/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786605672.json b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786605672.json
new file mode 100644
index 00000000..f7db2259
--- /dev/null
+++ b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786605672.json
@@ -0,0 +1,10 @@
+{
+  "id": "3487a977-1ff7-4ce3-af79-5643f067cea5",
+  "name": "oev-123",
+  "auth_method": {
+    "type": "password",
+    "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"
+}
\ No newline at end of file
diff --git a/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786605672.json b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786605672.json
new file mode 100644
index 00000000..e1f49700
--- /dev/null
+++ b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786605672.json
@@ -0,0 +1,13 @@
+{
+  "id": "7db2f101-b275-4525-bff3-e09a7a2ffbff",
+  "name": "oev-private",
+  "auth_method": {
+    "type": "private_key",
+    "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
+  },
+  "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_1786605672.json b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786605672.json
new file mode 100644
index 00000000..9fa493b9
--- /dev/null
+++ b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786605672.json
@@ -0,0 +1,10 @@
+{
+  "id": "81915847-1a38-40df-8abf-c80601af2708",
+  "name": "oev-2025",
+  "auth_method": {
+    "type": "password",
+    "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"
+}
\ No newline at end of file
diff --git a/backups/conflicts/sync_meta_conflict_1786605672.json b/backups/conflicts/sync_meta_conflict_1786605672.json
new file mode 100644
index 00000000..6541ca9f
--- /dev/null
+++ b/backups/conflicts/sync_meta_conflict_1786605672.json
@@ -0,0 +1,4 @@
+{
+  "last_sync": "2026-08-13T07:21:11.929408+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 f7db2259..a66f5965 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:U1RSTQEOwS+vtpkCP5qTvjKvzki7RyvysIt7Msl6P3posGGdpHcR"
+    "password": "ENC:v1:U1RSTQFfS+UZW3lv3LCEOQLoLxs72Zpdr2jRqp1BNDT+4lMdUFpS"
   },
   "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 e1f49700..35fd1b58 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: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",
+    "private_key": "ENC:v1:U1RSTQFfW29HKqacCJtvUXc+hZqJKhwqeA1kb/TzFXvzRKcCATrt8iV6mAls449Mg5CpprHfbmQNDdNQ8Nxd75fYdDBdiNmDyGkJG1KscsRc+Z46azTpuyale8eVWvlpKbXeM3Yipt1NJVxoOdQ667Fc2+3m0kuxZTSsGobeffiydz9OHsOmq3tz+/gcUH03T9sORbmwTdHNg0MMywUZ7DTAP+fAXEfM1nRZv8KGIDycYe7VAm2DVd0gEq8Kmsu2UUppJWX0hbNng9Pmoy4Jgynv3ZZo9aEqsdwj8xZmu/lYkoIIU3on0gWIm1smeHvhMQ74e38e0pZykVdAsq/NalpLKyMZs+5cMpD/Gxkv1vl6nenfaIme72Aaq6+H5K+RdUI9ir6x64xoyxFFTV64uT13WXYiTTdzwOqRld18C6Cgn9XFa12A6222guIIj12NTE8smtEcqWH5PozNvVoTKF2WeYb+amVfxB+8BMaExIcVqYFaDbryNjLZCwSgtUSs/74W1hYqpyjAcSBEh7W3VgYddwnpT+ttUZCmQpG6Y51QNbVLNpFYF+IhUwVRQUbPauSHm4AMpcfE7Aby",
     "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 9fa493b9..c02c285f 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:U1RSTQGHyN3RrEESEUN/cPjo7EYA/mMfHanwNxQzhx9LqUC1GRPlELs="
+    "password": "ENC:v1:U1RSTQEFSKGTxHexyXsPkSxmKQYYo2nzwznj+89AsiGVL15wZQv+8pg="
   },
   "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 6541ca9f..7ceb308f 100644
--- a/sync_meta.json
+++ b/sync_meta.json
@@ -1,4 +1,4 @@
 {
-  "last_sync": "2026-08-13T07:21:11.929408+00:00",
+  "last_sync": "2026-08-13T07:22:35.164959+00:00",
   "version": 1
 }
\ No newline at end of file