diff --git a/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786616051.json b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786616051.json
new file mode 100644
index 00000000..cdda911e
--- /dev/null
+++ b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786616051.json
@@ -0,0 +1,10 @@
+{
+  "id": "3487a977-1ff7-4ce3-af79-5643f067cea5",
+  "name": "oev-123",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHYsFVbW9B+3nCuq+WRwDJczlkOH8eu0tXb1kWb4tmfjFkR"
+  },
+  "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_1786616051.json b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786616051.json
new file mode 100644
index 00000000..2f31b4b9
--- /dev/null
+++ b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786616051.json
@@ -0,0 +1,13 @@
+{
+  "id": "7db2f101-b275-4525-bff3-e09a7a2ffbff",
+  "name": "oev-private",
+  "auth_method": {
+    "type": "private_key",
+    "private_key": "ENC:v1:U1RSTQE0/ZCvi9bks5SMfg/Hhw622hl1IzRFYohssTBAz/ilNA+M0bymt72Hk5tFVhSGlNteGs5Z8s5v3/7m5yG3L15lvBVxZ9m1oxrDxYh4+j80JebJctCurSZgAkcuXgR6ZiaHRk0znW17EMW351A3IsCJXkXsMI6i6017S7YytEMMRrK0X6F8pdsanz0Q6vqOmWXUVCvF8+UHLPznSl6lOxsVjWyiJ5Iwub4MGEp2KYhRrXr/nfBsWhcq9D9XoAb2M0DCiBFOSrlEiBTLQRHlZUii+9epWJmHPaT44WWncc7boIO4SV+AtlULX+J/cyHQemtNpRQTZkDwr/QY+LhTl01J9ZJV5UfNpjREytswdxTWB74TV+md5b+knzhjErvEy77o8dQll76I89msK5+mRdR8+b0QXvBcxem3G+GgQ2/UVpuXFA1Xyk38tGPAE/WmuiXl4wvadvovfrIq65zsjMmxf68RxHgEBmP9MGxYDH1+qGfSP796ROIsv/ifeYxlvoTEXsqOZACxQDPpRhgpMrB257RTc4Zc5ODJOlymtVKIdLJVWMCmy3C4KhZ0LyMcw0/XWYq84Uqo",
+    "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_1786616051.json b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786616051.json
new file mode 100644
index 00000000..304aed64
--- /dev/null
+++ b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786616051.json
@@ -0,0 +1,10 @@
+{
+  "id": "81915847-1a38-40df-8abf-c80601af2708",
+  "name": "oev-2025",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQFWzc58ZrC49Sam2NvQaBuMt0rvRo5QJl93PJdaLk+4HitWTMw="
+  },
+  "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 cdda911e..ff88e80b 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:U1RSTQHYsFVbW9B+3nCuq+WRwDJczlkOH8eu0tXb1kWb4tmfjFkR"
+    "password": "ENC:v1:U1RSTQGPBBsrPx2L3IN0VgBxRcDeBENCCL/OOngCh0Vy3oYlmD2g"
   },
   "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 2f31b4b9..29f2271d 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:U1RSTQE0/ZCvi9bks5SMfg/Hhw622hl1IzRFYohssTBAz/ilNA+M0bymt72Hk5tFVhSGlNteGs5Z8s5v3/7m5yG3L15lvBVxZ9m1oxrDxYh4+j80JebJctCurSZgAkcuXgR6ZiaHRk0znW17EMW351A3IsCJXkXsMI6i6017S7YytEMMRrK0X6F8pdsanz0Q6vqOmWXUVCvF8+UHLPznSl6lOxsVjWyiJ5Iwub4MGEp2KYhRrXr/nfBsWhcq9D9XoAb2M0DCiBFOSrlEiBTLQRHlZUii+9epWJmHPaT44WWncc7boIO4SV+AtlULX+J/cyHQemtNpRQTZkDwr/QY+LhTl01J9ZJV5UfNpjREytswdxTWB74TV+md5b+knzhjErvEy77o8dQll76I89msK5+mRdR8+b0QXvBcxem3G+GgQ2/UVpuXFA1Xyk38tGPAE/WmuiXl4wvadvovfrIq65zsjMmxf68RxHgEBmP9MGxYDH1+qGfSP796ROIsv/ifeYxlvoTEXsqOZACxQDPpRhgpMrB257RTc4Zc5ODJOlymtVKIdLJVWMCmy3C4KhZ0LyMcw0/XWYq84Uqo",
+    "private_key": "ENC:v1:U1RSTQFHCyIgmcIlwAE6iMLEZi0HCJGpThnYJTcwhLEKm5uSW1oOXe5IlVGfGyY/+JLJyh0D4SLzcimBPfqBNhBdXhAShon9xwkReNR54xTNKra746CtwkGhrqjWRldtQrHEettYwXbEkWc8Ug5q9TiYbFtj3n/Xq3CmVZq0NyfQx6oF1SUw4bvAVdX+sJdqDQf5PDCs6z94JZ9pKyWsGjX602a6Ns0NAePphkRQlNgFatLsOJ4xNwiV28TOrUUbpkyVLuwjkRW6uEZbKbmayjYG8ML+rHHG4wJIo5AFUSn5LEes7Vhuyg2hAxji6F8IGmzIscp74RW8wbanXDlQ+eNnnZM3GaX3exRGOk8IBwGvBy3i2WRBDi54xGaP/yFKY28nBD4v70JvILzr51cib9e2UzmTf3KTtGwCx76tfzIoFQzGclzT5OZXrYEJXBxhddPAsqmsZgsAnYQnLdzgaMOjs3d51DQ6RipBaihA8jqgFuwt/SFj1TE76s9VYA5Z+4WMG9gMSaMBLHdAIUp1xnkYRWfC8ykjHqpsrzkbVIy+aPm+c+w2QqMc7jesL432zdCkI/qbV/VazcYC",
     "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 304aed64..949619bd 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:U1RSTQFWzc58ZrC49Sam2NvQaBuMt0rvRo5QJl93PJdaLk+4HitWTMw="
+    "password": "ENC:v1:U1RSTQHpMAOw6EcNduGZvS1oSSUrAoAJ0u3Dg4xRoIEXs7Q418m0xUE="
   },
   "created_at": "2026-08-13T04:15:22.425983+00:00",
   "updated_at": "2026-08-13T04:15:22.425983+00:00"