diff --git a/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786611809.json b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786611809.json
new file mode 100644
index 00000000..295ac422
--- /dev/null
+++ b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786611809.json
@@ -0,0 +1,10 @@
+{
+  "id": "3487a977-1ff7-4ce3-af79-5643f067cea5",
+  "name": "oev-123",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQEieh1ePumgGOK+2jowAEz3i6PNFGp5K8pcaWiSFbpdWHx+"
+  },
+  "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_1786611809.json b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786611809.json
new file mode 100644
index 00000000..93394e7d
--- /dev/null
+++ b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786611809.json
@@ -0,0 +1,13 @@
+{
+  "id": "7db2f101-b275-4525-bff3-e09a7a2ffbff",
+  "name": "oev-private",
+  "auth_method": {
+    "type": "private_key",
+    "private_key": "ENC:v1:U1RSTQFgHAWwOKrtvwxw5u4Qmd/9KBUmbZf9EQSy4gqb/sYUn6QFLMWo7lIAt4LIZ4NEzqFSqHFMB4V8Cj76jQKlW1p8hM7OC40shQCM+wwPV7IBV/XJe0h/crYGL+M3+YGVw/Q+xZHc1p6bSKY7Baim4z1YRuqeZTaszdPDYtLaY27If06DSlI1bqTHVpTzlUkY1HZ77IjGZ0HHpAKSWsIBFKPzw57rh7yHfRWDJlmNOtVYH07ObaJS5GZ814/+oABkTXwWd33+Zw8ulDcNvNTkdAIhxzkHUx2qDiE87alVlrxAr2n8OkmgS3JjLRwoluGsjVf78Mqgt6tvS5CB7N66fOO2yG0ZordpiGk5c6YFMAgzFCkPnUpcnV4L2zFb11iWa0lxyiVo491FBnbiws9qNVLyphwVe5bArua4zer+xhKzkgJKboTM26npbWiEmp5yqdbABTJ8rKCZlQvGjQ1b4nmJJQGf2ypWyOPNAAu27HW7fvzrwBZueDphoFLdHS+YHJNnlGuDoB7OH0ITbHYXG98DHBh7xM3JI9YTqM1P/EgpI3L8UoTYU+muG5Crdut90fI7yWo+AOXo",
+    "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_1786611809.json b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786611809.json
new file mode 100644
index 00000000..b78bf07f
--- /dev/null
+++ b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786611809.json
@@ -0,0 +1,10 @@
+{
+  "id": "81915847-1a38-40df-8abf-c80601af2708",
+  "name": "oev-2025",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHibA/5yBzhY8ZypWaMK66+nfu0O76b/jEHHmCu7KaY6V/w5WA="
+  },
+  "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 295ac422..9f98b3fe 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:U1RSTQEieh1ePumgGOK+2jowAEz3i6PNFGp5K8pcaWiSFbpdWHx+"
+    "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"
diff --git a/identities/7db2f101-b275-4525-bff3-e09a7a2ffbff.json b/identities/7db2f101-b275-4525-bff3-e09a7a2ffbff.json
index 93394e7d..5247b0d5 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:U1RSTQFgHAWwOKrtvwxw5u4Qmd/9KBUmbZf9EQSy4gqb/sYUn6QFLMWo7lIAt4LIZ4NEzqFSqHFMB4V8Cj76jQKlW1p8hM7OC40shQCM+wwPV7IBV/XJe0h/crYGL+M3+YGVw/Q+xZHc1p6bSKY7Baim4z1YRuqeZTaszdPDYtLaY27If06DSlI1bqTHVpTzlUkY1HZ77IjGZ0HHpAKSWsIBFKPzw57rh7yHfRWDJlmNOtVYH07ObaJS5GZ814/+oABkTXwWd33+Zw8ulDcNvNTkdAIhxzkHUx2qDiE87alVlrxAr2n8OkmgS3JjLRwoluGsjVf78Mqgt6tvS5CB7N66fOO2yG0ZordpiGk5c6YFMAgzFCkPnUpcnV4L2zFb11iWa0lxyiVo491FBnbiws9qNVLyphwVe5bArua4zer+xhKzkgJKboTM26npbWiEmp5yqdbABTJ8rKCZlQvGjQ1b4nmJJQGf2ypWyOPNAAu27HW7fvzrwBZueDphoFLdHS+YHJNnlGuDoB7OH0ITbHYXG98DHBh7xM3JI9YTqM1P/EgpI3L8UoTYU+muG5Crdut90fI7yWo+AOXo",
+    "private_key": "ENC:v1:U1RSTQGcsE8p6xMmrW4czXYiN3ixDJsir27a48wRy/PTBkilNAhvZXlf1qhkY0+33TqezN8MS8JirYFvFHZAjLliMn2JKRXe5sJbzyBl62OLMWg/TTC79vvydcIpIdto49x7FIuM0lCfBHaaYXF+Bm3R72Xof6YtUEwLe5HZUqAivXIAWZPgbSDwjgajwCBC8IreTJ2YJNYI/7kFgw6Oc9IDPXJY9AMut1QjjccpECBAyiuhUKO2ZUCggg22hgb4KAKfb6n8GVwtHNFQWYhUBJJSjg41oBtqYlMoy3Z3f9ZrkHy5pzVLbf0iqG9Mz1Mhy815sSrJ4fV+2KNrP5CF9m6FDm1mUk3n2OcJIw0s7EjBwZeqovKAAYFvlX047cpCfracNLlaDvrIetfSSUccRKYxzFO3PtVBWZKV4OpST02BjxK3JD/Xp8aW6mGe472fHK5UbPVdzHlcnaSTUEQOOg2YjVZ8fIC6py8O0sHM9D5GYK0ByST/loae0T6a3/R4LYmhLlmnBqpmZht1FwvD1yjRzgo62GxuepZ6P05/CgjpCOM49mQnxqwNEkdTrlpPwKrqHps3q1Melmz4",
     "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 b78bf07f..d7d5d914 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:U1RSTQHibA/5yBzhY8ZypWaMK66+nfu0O76b/jEHHmCu7KaY6V/w5WA="
+    "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"