diff --git a/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786611870.json b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786611870.json
new file mode 100644
index 00000000..9f98b3fe
--- /dev/null
+++ b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786611870.json
@@ -0,0 +1,10 @@
+{
+  "id": "3487a977-1ff7-4ce3-af79-5643f067cea5",
+  "name": "oev-123",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQE8gnS+mCAI0sg1y8XQPffEH3MVqFHqsmGYQE+AXrH7+vOo"
+  },
+  "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_1786611870.json b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786611870.json
new file mode 100644
index 00000000..5247b0d5
--- /dev/null
+++ b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786611870.json
@@ -0,0 +1,13 @@
+{
+  "id": "7db2f101-b275-4525-bff3-e09a7a2ffbff",
+  "name": "oev-private",
+  "auth_method": {
+    "type": "private_key",
+    "private_key": "ENC:v1:U1RSTQGcsE8p6xMmrW4czXYiN3ixDJsir27a48wRy/PTBkilNAhvZXlf1qhkY0+33TqezN8MS8JirYFvFHZAjLliMn2JKRXe5sJbzyBl62OLMWg/TTC79vvydcIpIdto49x7FIuM0lCfBHaaYXF+Bm3R72Xof6YtUEwLe5HZUqAivXIAWZPgbSDwjgajwCBC8IreTJ2YJNYI/7kFgw6Oc9IDPXJY9AMut1QjjccpECBAyiuhUKO2ZUCggg22hgb4KAKfb6n8GVwtHNFQWYhUBJJSjg41oBtqYlMoy3Z3f9ZrkHy5pzVLbf0iqG9Mz1Mhy815sSrJ4fV+2KNrP5CF9m6FDm1mUk3n2OcJIw0s7EjBwZeqovKAAYFvlX047cpCfracNLlaDvrIetfSSUccRKYxzFO3PtVBWZKV4OpST02BjxK3JD/Xp8aW6mGe472fHK5UbPVdzHlcnaSTUEQOOg2YjVZ8fIC6py8O0sHM9D5GYK0ByST/loae0T6a3/R4LYmhLlmnBqpmZht1FwvD1yjRzgo62GxuepZ6P05/CgjpCOM49mQnxqwNEkdTrlpPwKrqHps3q1Melmz4",
+    "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_1786611870.json b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786611870.json
new file mode 100644
index 00000000..d7d5d914
--- /dev/null
+++ b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786611870.json
@@ -0,0 +1,10 @@
+{
+  "id": "81915847-1a38-40df-8abf-c80601af2708",
+  "name": "oev-2025",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQE4g/pS+j0mdvbFxPx09nfzqsq2+jUisD2mzhJzqh8nGf7fFRE="
+  },
+  "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 9f98b3fe..5cfe2410 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:U1RSTQE8gnS+mCAI0sg1y8XQPffEH3MVqFHqsmGYQE+AXrH7+vOo"
+    "password": "ENC:v1:U1RSTQHe66rSIMTYWQDSsQ/2BoX2VvKhDjAewhUWMmt8LmDvcs4T"
   },
   "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 5247b0d5..5d5e7ae4 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:U1RSTQGcsE8p6xMmrW4czXYiN3ixDJsir27a48wRy/PTBkilNAhvZXlf1qhkY0+33TqezN8MS8JirYFvFHZAjLliMn2JKRXe5sJbzyBl62OLMWg/TTC79vvydcIpIdto49x7FIuM0lCfBHaaYXF+Bm3R72Xof6YtUEwLe5HZUqAivXIAWZPgbSDwjgajwCBC8IreTJ2YJNYI/7kFgw6Oc9IDPXJY9AMut1QjjccpECBAyiuhUKO2ZUCggg22hgb4KAKfb6n8GVwtHNFQWYhUBJJSjg41oBtqYlMoy3Z3f9ZrkHy5pzVLbf0iqG9Mz1Mhy815sSrJ4fV+2KNrP5CF9m6FDm1mUk3n2OcJIw0s7EjBwZeqovKAAYFvlX047cpCfracNLlaDvrIetfSSUccRKYxzFO3PtVBWZKV4OpST02BjxK3JD/Xp8aW6mGe472fHK5UbPVdzHlcnaSTUEQOOg2YjVZ8fIC6py8O0sHM9D5GYK0ByST/loae0T6a3/R4LYmhLlmnBqpmZht1FwvD1yjRzgo62GxuepZ6P05/CgjpCOM49mQnxqwNEkdTrlpPwKrqHps3q1Melmz4",
+    "private_key": "ENC:v1:U1RSTQG741eoMp4IkoWfpi0k+q/CISR9jC1mN4ThkHYxUv/dW/aXuyQLpDtj+5ESK0ToVFr0P5aOI9SMcMXVXglNU/dHXJHhWme1UR5V08LYF+R7u14Jw4tXsuPiydT29re2WoQgnVJw/sgyJcbCsIS1BviVe7HQHFczgR1LbOGB7fIGn5OlXi8qVz+U5BqhMH6Y669Gr0i2zlZQWg2sSSsqWv3Bd+4ER+Rx/21QbcMbW60OKFsQmrdHnN4WdTPT9bs//GeVouVJcLukAOokniO8cFE6LmnJBt2Zo+pc2vMhV5i75SNoj1zjNqT23tvOQ/CyJ9PDckspvogv7Dzp2rPRJXJmuT2AaOGch5/Myqxwt0fXUpKBW32ktcu1rFBPpoV8979kNjnkPf7Im6AXswjW/Mq1NcWl0m67gkMhWMzV0DISUtDQZcu8p58hBDokrddb8ngNvsCMz/YOzwRVFuP+wFhyPTdwP1KNvpjaymy1F4uAc64l2hYLp0z5wsPlm4okWD67o4Ega27XHRxeWGFChElzhsrUL0TiAQTFvAoBqE8UHRazUwWct2M3kUHmyGcHdWYhXRswhK7r",
     "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 d7d5d914..7c3de943 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:U1RSTQE4g/pS+j0mdvbFxPx09nfzqsq2+jUisD2mzhJzqh8nGf7fFRE="
+    "password": "ENC:v1:U1RSTQEHMzhCQeknr9EWwK4KyD0afpw2LP5+wgkP87E//BA2GX9K7dI="
   },
   "created_at": "2026-08-13T04:15:22.425983+00:00",
   "updated_at": "2026-08-13T04:15:22.425983+00:00"