diff --git a/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786611505.json b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786611505.json
new file mode 100644
index 00000000..94118987
--- /dev/null
+++ b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786611505.json
@@ -0,0 +1,10 @@
+{
+  "id": "3487a977-1ff7-4ce3-af79-5643f067cea5",
+  "name": "oev-123",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQEh4ZUXV+vcgTxC/L/745TxwisLBKj5EhirEDbTqSMAMm+h"
+  },
+  "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_1786611505.json b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786611505.json
new file mode 100644
index 00000000..6ad15763
--- /dev/null
+++ b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786611505.json
@@ -0,0 +1,13 @@
+{
+  "id": "7db2f101-b275-4525-bff3-e09a7a2ffbff",
+  "name": "oev-private",
+  "auth_method": {
+    "type": "private_key",
+    "private_key": "ENC:v1:U1RSTQGBB8hvuAf2Onuu9zEUbAZojfZQZ7/bSS/glK/H21mRaiFUyy+ElJnsrm78LGTAk0p4V7prXO9/x+qXPI2tTI3DKR38Nni2B1oq5X4Rxo60i3yddJLXSmezYrTeJDQoEFFpXHaPrnshnMKLeU4ANRUzKxptMYt0bWJ1QN287PC1GHFHf3ImZluMIPul4aXtYXN0+GQ9PI+8AMzM+RtQT7cL9hulMhTmfZ1UWAPxtcsPTVRWp+kDeaEpA6DCmjfpDZ9VZBIT/xRdw3814sU22VJGisuibZcCu4MPGmz5eyxmiytiI+1n8uIkHwlXbJmV/KSR4hQsClmGufc1aAc2T+hjyI/puV+scXWA5xSF9USNmyUbjNEP7mjibih9wFrLw4nbE0bAZ+g7a2RCBJ/nZk9b7TSvF347CWoM49L6Pbk4A0TjUd90VPGFx6h9jmV0LpZ+YmTuy/xlWyRNXVyrP+/jE/vcdQEZ8YnegTD4F3+IpKhS8Jvq9Gay1CcE4uaXRYBOoyeDGNPBCyUBPEOU5b+ji9yXj/gXszRoD0R32fl2NAhkUhndbJoDM4NhhltZE67ntO/0kAG4",
+    "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_1786611505.json b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786611505.json
new file mode 100644
index 00000000..cc4dceff
--- /dev/null
+++ b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786611505.json
@@ -0,0 +1,10 @@
+{
+  "id": "81915847-1a38-40df-8abf-c80601af2708",
+  "name": "oev-2025",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQEomCdweXvmcLEHCHzaKWVTRtfTEc1K/60BX0VH2PBkSwc9rKE="
+  },
+  "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 94118987..2c6fe420 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:U1RSTQEh4ZUXV+vcgTxC/L/745TxwisLBKj5EhirEDbTqSMAMm+h"
+    "password": "ENC:v1:U1RSTQHy9k1z0CRc641lffXJzSyEd2E5oV2b4TmMjk07Vrz4t1zh"
   },
   "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 6ad15763..c000ccec 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:U1RSTQGBB8hvuAf2Onuu9zEUbAZojfZQZ7/bSS/glK/H21mRaiFUyy+ElJnsrm78LGTAk0p4V7prXO9/x+qXPI2tTI3DKR38Nni2B1oq5X4Rxo60i3yddJLXSmezYrTeJDQoEFFpXHaPrnshnMKLeU4ANRUzKxptMYt0bWJ1QN287PC1GHFHf3ImZluMIPul4aXtYXN0+GQ9PI+8AMzM+RtQT7cL9hulMhTmfZ1UWAPxtcsPTVRWp+kDeaEpA6DCmjfpDZ9VZBIT/xRdw3814sU22VJGisuibZcCu4MPGmz5eyxmiytiI+1n8uIkHwlXbJmV/KSR4hQsClmGufc1aAc2T+hjyI/puV+scXWA5xSF9USNmyUbjNEP7mjibih9wFrLw4nbE0bAZ+g7a2RCBJ/nZk9b7TSvF347CWoM49L6Pbk4A0TjUd90VPGFx6h9jmV0LpZ+YmTuy/xlWyRNXVyrP+/jE/vcdQEZ8YnegTD4F3+IpKhS8Jvq9Gay1CcE4uaXRYBOoyeDGNPBCyUBPEOU5b+ji9yXj/gXszRoD0R32fl2NAhkUhndbJoDM4NhhltZE67ntO/0kAG4",
+    "private_key": "ENC:v1:U1RSTQHMzl498rdJjHMtoJoAVZjK3E1RU7VfhBI//M+/3Aei9eqhuGx1MuCLiR91+3BvnjOviJASCyng0ofJKF6jTFbGKV3AmD95zhnMDCIP14ESNPNwvT/Fyo7zwFuVu5pVMWFQRLkadS9Gs7klMukGE8YtuzqZFRyRDsNLGGS9oHUSOKE5mO/o3NJDMukWwXqfDmIf7rWnxZ0AB00EPkIj29wNroCTBG5EdcDYrA+Szzw1QCNk5K4GlTB/tt6yC26Q+t0Ununx8Z4r8qSUtCByfQ8h7lX5NHKSqU7FKspglZ/ejt6VgAWQc618fFVMOH8EOnipwJGhX49eQch95IqR4LDZ1ybtWjf0joW3urF66XxT3gz5gFy+g5in+2QbtmyGYZEbhpedl0a4JLogMr1ReWaFh+QEceMzz1KeqE3wjSaQ9o7Zq3C/oqyXU7nqfJM4d58h7+b7qQMYFTGSyyUZ2yQ8Rmd2mxkacBiB01W36ealErHl6Y53OLCBo+9MxEcw5nqlfKNWebmis1T1kFsG22++Mjmr4SXi/JFLGRz4cvY4Lj11dVADrchgNVZjIQQvEsJKJeR0acCe",
     "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 cc4dceff..441e3f85 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:U1RSTQEomCdweXvmcLEHCHzaKWVTRtfTEc1K/60BX0VH2PBkSwc9rKE="
+    "password": "ENC:v1:U1RSTQFZQsatJeP6v1+KLFYTVlaxRkLuRlXA99SDKJLHggg45w/jDsk="
   },
   "created_at": "2026-08-13T04:15:22.425983+00:00",
   "updated_at": "2026-08-13T04:15:22.425983+00:00"