diff --git a/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786615929.json b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786615929.json
new file mode 100644
index 00000000..8b571a11
--- /dev/null
+++ b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786615929.json
@@ -0,0 +1,10 @@
+{
+  "id": "3487a977-1ff7-4ce3-af79-5643f067cea5",
+  "name": "oev-123",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQEBShOOKKdj486cFmD/Td125To+BkRdDxy4PeRwDyfUCXk2"
+  },
+  "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_1786615929.json b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786615929.json
new file mode 100644
index 00000000..5bb3f21b
--- /dev/null
+++ b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786615929.json
@@ -0,0 +1,13 @@
+{
+  "id": "7db2f101-b275-4525-bff3-e09a7a2ffbff",
+  "name": "oev-private",
+  "auth_method": {
+    "type": "private_key",
+    "private_key": "ENC:v1:U1RSTQHf/UjLYqK+mgtsW9OlZv08q+PflANp4WTR25nbCvfIbgKpgOH9DsthODVRQmNzp2cd3aG3iV6g2ukODGl5C0v7KxM39LbURUiwFUh9X3QXoQKy1eQ3TxQ+QC2zmBIAagZxqan34AOG6EKXgx+CeHmXksq55LEuY5wxT+CShRNDeWOAB35LVs7kY/lAOToJ9vSzPPPsjse0Z6+nFea1PhOEubVTAW4kVvCdhaUgrEsj/Dcj0b0lRICGdQoUraXXiibWnXCfTmjb1PXqBg5ZVUs0hkuRCAyW78iyhrtz605XuTsrZoRuRovsxwaprGtP/JRFKJaSFFC/jDgDjvv/W7yWVNav4xZ4NAyI5bY989J0iw0rYBva6Ky6AhJRGBGQonjtlMgYL6+dKy2IosURZqhqtcFvB4DFa555R5aUCUGx5Bvz9jJCUh9BBY9ZxsbYgDFuo6/SKv050b/fBtYQ8QsLgFwReZ/au/pd6+0WXJjS1bnaGPK9vwRKfYw1Vvn4BRhtZmLwwcPPVZBeGlBRP1zDkU9eMZdtS51yaCLlAH+WXBbkI2eAXlzY9WkJZ9HNy+qttj74/tMn",
+    "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_1786615929.json b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786615929.json
new file mode 100644
index 00000000..d88e43b9
--- /dev/null
+++ b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786615929.json
@@ -0,0 +1,10 @@
+{
+  "id": "81915847-1a38-40df-8abf-c80601af2708",
+  "name": "oev-2025",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQEep2Ty7p4+z0Xujh6jeZTc34PKXJj8W1sV6xvxXARsyA+1L/Q="
+  },
+  "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 8b571a11..ce6477f5 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:U1RSTQEBShOOKKdj486cFmD/Td125To+BkRdDxy4PeRwDyfUCXk2"
+    "password": "ENC:v1:U1RSTQGeBOVbML4jqJ1YFBFboKAdQdQGYwwe3BH7xHrf+2Xxw6kf"
   },
   "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 5bb3f21b..e28b3b2b 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:U1RSTQHf/UjLYqK+mgtsW9OlZv08q+PflANp4WTR25nbCvfIbgKpgOH9DsthODVRQmNzp2cd3aG3iV6g2ukODGl5C0v7KxM39LbURUiwFUh9X3QXoQKy1eQ3TxQ+QC2zmBIAagZxqan34AOG6EKXgx+CeHmXksq55LEuY5wxT+CShRNDeWOAB35LVs7kY/lAOToJ9vSzPPPsjse0Z6+nFea1PhOEubVTAW4kVvCdhaUgrEsj/Dcj0b0lRICGdQoUraXXiibWnXCfTmjb1PXqBg5ZVUs0hkuRCAyW78iyhrtz605XuTsrZoRuRovsxwaprGtP/JRFKJaSFFC/jDgDjvv/W7yWVNav4xZ4NAyI5bY989J0iw0rYBva6Ky6AhJRGBGQonjtlMgYL6+dKy2IosURZqhqtcFvB4DFa555R5aUCUGx5Bvz9jJCUh9BBY9ZxsbYgDFuo6/SKv050b/fBtYQ8QsLgFwReZ/au/pd6+0WXJjS1bnaGPK9vwRKfYw1Vvn4BRhtZmLwwcPPVZBeGlBRP1zDkU9eMZdtS51yaCLlAH+WXBbkI2eAXlzY9WkJZ9HNy+qttj74/tMn",
+    "private_key": "ENC:v1:U1RSTQESoVNiT5aANFxyhBvKkeZuTeSDYwbiOUnigzqYp+sKx7yeHaSPOXExVet+UfRx+UWQ3cSOL0QNXTHCoZ27Rx2YIL8Yzw+S9eY0IT4Mxny5A8c5BLQLev/spBaXIDS5WJU7I3gN5vWrSI5dcwcYh3zGZ/7Ar519zFHGJ9Uw9Tr3kHbXg5hvHi4OBxZN+MsS0iEKYNWVUY1Rg857IPuu9xf/jjP/Iw9R+eGa2jZF0YB4YJz5N795O14g18cEYmf8Q8RfqrUHdT6MbjJZVob5rP6wFzdaqVL0vxBmhfBtJIxgcQX/gt3hxC/pUst7EXLDyzCJhegoWUjMi256fyKJ/Hl26ebKFuNEGsGUmC13OTwzanAVEop8XG2JUUkaZaxRtxfvjo/mKCVgr9bj7atA+w2mE2t21+gr37ONXd4QsR0HhEujRBIlqGrQPvMWFjfWi31KyekaEM8CyGxxxmtsGybBFxiYt3smCfgMHw3yQPM8t8yTgzFegUMSD3Bb7pzNpHRvimlNUpmVYK/Fy6EWBVnTPKBsSD/ujKl9wkEGV/ZNc/FD5PwTyOLPjTT4zL/CgTZ0G0SvIbe4",
     "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 d88e43b9..cdf7ad9c 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:U1RSTQEep2Ty7p4+z0Xujh6jeZTc34PKXJj8W1sV6xvxXARsyA+1L/Q="
+    "password": "ENC:v1:U1RSTQFC2sjKoXwZx6OSR0iGT4fj0C5uFf6Za5OYhFAnfD02OCAecGY="
   },
   "created_at": "2026-08-13T04:15:22.425983+00:00",
   "updated_at": "2026-08-13T04:15:22.425983+00:00"