diff --git a/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786615626.json b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786615626.json
new file mode 100644
index 00000000..0721e2d0
--- /dev/null
+++ b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786615626.json
@@ -0,0 +1,10 @@
+{
+  "id": "3487a977-1ff7-4ce3-af79-5643f067cea5",
+  "name": "oev-123",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQE7wkf1RRgMHwkhJJBRwkd06i92G9yi0hpuWZeSllOGlaDN"
+  },
+  "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_1786615626.json b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786615626.json
new file mode 100644
index 00000000..90a2d08d
--- /dev/null
+++ b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786615626.json
@@ -0,0 +1,13 @@
+{
+  "id": "7db2f101-b275-4525-bff3-e09a7a2ffbff",
+  "name": "oev-private",
+  "auth_method": {
+    "type": "private_key",
+    "private_key": "ENC:v1:U1RSTQF+2N6a6zSC6WPw5xUPDgXGA6jwTY3RcUDAqcd8YeS7tg2mNNTQH0I6jgmEP8sLR0dY5mvNi/XIbYYioeo8fHy8r2U0ZAkcQ0UaHvwe6N/UU1qQ+7q1kzWmiVfxkorXVZXBHcTZoS+2ZOiPhLZFRqHkggU+egsFrJKG4iI31ap1HCFc4L36b7ACHI/1HI7PfYq5qqSRu93eTCHXWI6AqMVXVTlizfoqcsjjPzAcgVbtPoWj+taAB+NxWAaJQpL839NRtupaE5aC02GtXInXccLmGh41fHLFI0xSjbxwjL3Mpj4TZWwEMPx4mk+rz4h5kbNQH8Yn+ssfm4wdZjWSZA/5b5WFU4MwvCFQkKeOUwOPk+3aVAuheQesdf2N367m3b2djivvgy7vdyTIanjDv2As0X5jVxSVDToJ6fdWZi9WiRzdIZRHT4TywjiUa2w6+er5OH99onvEtdhz4cbYjJrPYa41O2PBZBkZ+NQJVmhvldZm/bU6dhcfpri0itcfccozlpaBa6IHj+mBYzUHYxDkXF4q3F/e9LM1ht/8R7fiUswNpI9K+0yMBfMs2RZo2AaEHYxeU7pP",
+    "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_1786615626.json b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786615626.json
new file mode 100644
index 00000000..00c2200d
--- /dev/null
+++ b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786615626.json
@@ -0,0 +1,10 @@
+{
+  "id": "81915847-1a38-40df-8abf-c80601af2708",
+  "name": "oev-2025",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQE2RV1nizNLjFWt3KKLVxLzRnZwGVQjPZ7G4fswC8o2JGm7zow="
+  },
+  "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/identities/3487a977-1ff7-4ce3-af79-5643f067cea5.json b/identities/3487a977-1ff7-4ce3-af79-5643f067cea5.json
index 0721e2d0..f444d3c7 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:U1RSTQE7wkf1RRgMHwkhJJBRwkd06i92G9yi0hpuWZeSllOGlaDN"
+    "password": "ENC:v1:U1RSTQHXs5SqehNO5KYlERvJ491oMp/XwIrHwn646pCXGhzkTFzF"
   },
   "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 90a2d08d..9226ea0b 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:U1RSTQF+2N6a6zSC6WPw5xUPDgXGA6jwTY3RcUDAqcd8YeS7tg2mNNTQH0I6jgmEP8sLR0dY5mvNi/XIbYYioeo8fHy8r2U0ZAkcQ0UaHvwe6N/UU1qQ+7q1kzWmiVfxkorXVZXBHcTZoS+2ZOiPhLZFRqHkggU+egsFrJKG4iI31ap1HCFc4L36b7ACHI/1HI7PfYq5qqSRu93eTCHXWI6AqMVXVTlizfoqcsjjPzAcgVbtPoWj+taAB+NxWAaJQpL839NRtupaE5aC02GtXInXccLmGh41fHLFI0xSjbxwjL3Mpj4TZWwEMPx4mk+rz4h5kbNQH8Yn+ssfm4wdZjWSZA/5b5WFU4MwvCFQkKeOUwOPk+3aVAuheQesdf2N367m3b2djivvgy7vdyTIanjDv2As0X5jVxSVDToJ6fdWZi9WiRzdIZRHT4TywjiUa2w6+er5OH99onvEtdhz4cbYjJrPYa41O2PBZBkZ+NQJVmhvldZm/bU6dhcfpri0itcfccozlpaBa6IHj+mBYzUHYxDkXF4q3F/e9LM1ht/8R7fiUswNpI9K+0yMBfMs2RZo2AaEHYxeU7pP",
+    "private_key": "ENC:v1:U1RSTQG4NsYawjxDobmKpEPXnKUphf+oDKnIrFhl6KGlOhRpNS9THJpy0tgQOSj0+0t4yX8z9qXa8qMdrx5EXbP676h3Uj7/9ta2napRI7ZaVgRUPt4FEN8R66NbWu2L9Kypq5V122SgXIDMZ08GrJVCDFiR1RyShVJ4Wk8TMdXHF9IFNSOyacvaxuazh22OOFdSvFGHT7JYmtmEKBwLf6VyBZm9aaFLDSOLKAI0robLP7uQ+3D8MgFef4GcvfuPhT2PekD2i1DNS2P2FN6LXVVvqOpqKTUcEfbxCXEV2YoYb7dRC2sp6XdYM8D9xeS9Xq0NYYAfguel2/MyUHTZso5nQT661eugNbD7wVXGoG/sRFQwM6rCboeTzz2JIZ+9c0mKP5KJLxr2RDq8CNSJsbVJSmHAhRNmKW1Y6K9D5XfgVwMDs/7Z5Zx1f4yrMZZwuqdDfhgJSQUnpiv6z1yqcZ6f0cfzO+TKI0KI3FcOAb6MEVJ9jgWvnVaHTEMr80C5CNigWFbNRMY+OYqKjsdIKTlcOx+raiWLCezyqeesg7H1/+LFZBECEuXQi8DlRFoqQtMg1iXXSCoEz1DP",
     "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 00c2200d..73d31bc3 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:U1RSTQE2RV1nizNLjFWt3KKLVxLzRnZwGVQjPZ7G4fswC8o2JGm7zow="
+    "password": "ENC:v1:U1RSTQHOOmd0HitxKfRSHdEGWZEJSJMDVxFe4AfFGq/6eso6EMMg97k="
   },
   "created_at": "2026-08-13T04:15:22.425983+00:00",
   "updated_at": "2026-08-13T04:15:22.425983+00:00"