diff --git a/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786606048.json b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786606048.json
new file mode 100644
index 00000000..88cd7ae3
--- /dev/null
+++ b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786606048.json
@@ -0,0 +1,10 @@
+{
+  "id": "3487a977-1ff7-4ce3-af79-5643f067cea5",
+  "name": "oev-123",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQER4LCI3IiRAMr18VbcYBBG0HAZF/x5UIJt47hhQpMACTrA"
+  },
+  "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_1786606048.json b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786606048.json
new file mode 100644
index 00000000..5393fa90
--- /dev/null
+++ b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786606048.json
@@ -0,0 +1,13 @@
+{
+  "id": "7db2f101-b275-4525-bff3-e09a7a2ffbff",
+  "name": "oev-private",
+  "auth_method": {
+    "type": "private_key",
+    "private_key": "ENC:v1:U1RSTQG6sKA4VuLsQ29n/q11LBUSzb0IAK+2dv9jKEO4JMJUnq5kxcw7CsdsCnr4FPlzE4cbkQeSJyfavLv8hDTRLxVkQegHEvMOBF2HzAQTW5FHOUGVRFGRw0hev9CiwtC6caxhW5yJTjB7FbE26Woe1yWgRocbzyRwkTlfFNr6jyK37HKLISZTWTpRRYBJFill9fJpjVMRCaOygOwSQ0Y6HZtc/ONoB+FelZcUlxMVrblutUo3rVoXnCYK4WuLtxdNOWCJHwJbZyYV1KEFI0Nx1nHIhrBBRQqf25qGoQwOhBUTSsfg3ybbPeeI3U44AcLawpzv4Ss3MwUXALVaCcyE1xQxjMaee160C6RQ6SHN7VfTfJO+NqdB628tvFYTeKvbdtstgXo73rwQT5AfW5+DXB6uUnAHO4YqXU0+hLCW2PPYdG3IPUxdMRA1ITExPcW9j4vpXXg1XbXKkvaZTBa3bKcDQre+ZUp5UVeYRKbvZZqgFDLJfKfDybF5lO72EkyfL16/HWC0CHIYasytbEGqR2D8mr9v7FzrZgrT4mJ8/Iy0Iucfjz10odZOHBTvr7zODiewfKZkeUrl",
+    "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_1786606048.json b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786606048.json
new file mode 100644
index 00000000..53bbd606
--- /dev/null
+++ b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786606048.json
@@ -0,0 +1,10 @@
+{
+  "id": "81915847-1a38-40df-8abf-c80601af2708",
+  "name": "oev-2025",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHzEPrYalO4ibBDcQ51tuXZYcwv2DRcfNLEqes5r0dhIqx4ISo="
+  },
+  "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_1786606048.json b/backups/conflicts/sync_meta_conflict_1786606048.json
new file mode 100644
index 00000000..e374c26d
--- /dev/null
+++ b/backups/conflicts/sync_meta_conflict_1786606048.json
@@ -0,0 +1,4 @@
+{
+  "last_sync": "2026-08-13T07:27:27.554593+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 88cd7ae3..1a19a438 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:U1RSTQER4LCI3IiRAMr18VbcYBBG0HAZF/x5UIJt47hhQpMACTrA"
+    "password": "ENC:v1:U1RSTQGZ5Fev70zdFlNF1mkfVNA2/bHVzrGRUTz77T5TLWiTJBtA"
   },
   "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 5393fa90..48fce900 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:U1RSTQG6sKA4VuLsQ29n/q11LBUSzb0IAK+2dv9jKEO4JMJUnq5kxcw7CsdsCnr4FPlzE4cbkQeSJyfavLv8hDTRLxVkQegHEvMOBF2HzAQTW5FHOUGVRFGRw0hev9CiwtC6caxhW5yJTjB7FbE26Woe1yWgRocbzyRwkTlfFNr6jyK37HKLISZTWTpRRYBJFill9fJpjVMRCaOygOwSQ0Y6HZtc/ONoB+FelZcUlxMVrblutUo3rVoXnCYK4WuLtxdNOWCJHwJbZyYV1KEFI0Nx1nHIhrBBRQqf25qGoQwOhBUTSsfg3ybbPeeI3U44AcLawpzv4Ss3MwUXALVaCcyE1xQxjMaee160C6RQ6SHN7VfTfJO+NqdB628tvFYTeKvbdtstgXo73rwQT5AfW5+DXB6uUnAHO4YqXU0+hLCW2PPYdG3IPUxdMRA1ITExPcW9j4vpXXg1XbXKkvaZTBa3bKcDQre+ZUp5UVeYRKbvZZqgFDLJfKfDybF5lO72EkyfL16/HWC0CHIYasytbEGqR2D8mr9v7FzrZgrT4mJ8/Iy0Iucfjz10odZOHBTvr7zODiewfKZkeUrl",
+    "private_key": "ENC:v1:U1RSTQGsAc96DtIo8OjvrBld8KwUO9dOetc+vQ7jt7Wwj4fi6N1L7LlVG884rjE5YE6XpQV4DcVx/cRhlhb2ENKlyvwjc1nyvDPpU1dYoQjxHo4pEsoXdLhphNNxhVc/P0cwcyOZ5x5Qvj7fjFaAITxUPqs4wkY0jGTBSk5ln1AcyNZZl90+dwE0XU2p1bAuKlPhXDWMRgzQgBNCxYms7O8djLFzLyPD3j8wfWkQiuROJe3QW90NFZnWz6eK8I5OlxvBiLdtwGbZzU2MRlXHbWOPwdG3Y8LO/gjDAzn+y7K+bUjsQ5oRjZTgdzQ2OWIf/M+EKJ5m85KU/WpOETI7+4gPXu8zlul3UAlneI6dFfEYA9Kqy5Wzks6nccAYU0F9YzKG2+ZmD9Dxb55q5v/F5RJP/wht0UNlzE4+0E9fc6jJUwhiaYfQyz/1rVcqR3WmTfsqmDYqHeMv4N12Lqt/5ArmgCrU06wZpaqn1gHKg5mLtkDqnrRJQ2P38ndnXDvLLSPKh7fWgOMJE4gCOL9TZhsKk6DqBX4y54bOiChYREJ/hNJocBEhlUYbAyUGSF0ioTbYaZxois+90iKk",
     "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 53bbd606..c63d4dae 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:U1RSTQHzEPrYalO4ibBDcQ51tuXZYcwv2DRcfNLEqes5r0dhIqx4ISo="
+    "password": "ENC:v1:U1RSTQF9c3Wzyexm70juwt74PT+6kS3SNMgGepbAiitRcoWOuf6UKH8="
   },
   "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 e374c26d..81745113 100644
--- a/sync_meta.json
+++ b/sync_meta.json
@@ -1,4 +1,3 @@
 {
-  "last_sync": "2026-08-13T07:27:27.554593+00:00",
   "version": 1
 }
\ No newline at end of file