diff --git a/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786612581.json b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786612581.json
new file mode 100644
index 00000000..c009e02f
--- /dev/null
+++ b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786612581.json
@@ -0,0 +1,10 @@
+{
+  "id": "3487a977-1ff7-4ce3-af79-5643f067cea5",
+  "name": "oev-123",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQEWxydkXFJOlPPVayNXOFmyyq35Dya0eAznOVbeR8rvs4Gj"
+  },
+  "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_1786612581.json b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786612581.json
new file mode 100644
index 00000000..2bed0f57
--- /dev/null
+++ b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786612581.json
@@ -0,0 +1,13 @@
+{
+  "id": "7db2f101-b275-4525-bff3-e09a7a2ffbff",
+  "name": "oev-private",
+  "auth_method": {
+    "type": "private_key",
+    "private_key": "ENC:v1:U1RSTQFrHmpkNM075VGDlwTb6+bOBD7VhtryI5p2DLS1v64JlwXX6rFxQ17GzalyW4/lKwXDhZhQhAlifdYS1xXL3iLf/Ds+y6A80RCn+x57IS8a0L9gLuEQodSWfOjXGd5iY5zFFawh7TDdIBrsz8edjUN0M48BT1IXT52YjrMFYG1WJo7cNPljrIDUUVio75x5ttmZF/NzwHyORfttzPsVukp96p64gNXOLGkbSYQLV1XeUtA7UQFJDxOFCzCGPtgy8X0nxD+l59tFzKi6Leu1NwrX0JoGUeHqljgWWnOFOyMEI33JzCxRNl9Evi+u63bK/haTBs7IshlFE9WQ1+NO0+xdEIgVdwsz4Be1x4sBKywJ6H7NRv9rouedQX1kH/YlzXh3GT89C4APK7RRsM+yclL4Wt4fZ5Hv3pUlOM/tErHx7R4ZUbaYtmqutcLAqgELHTj4O0hHpVXku1XV/6d0ECw251+Yj+blGBWYbZZxBAV/UeDmCbNqz6Nymi1XszzhtkzF5+jMMqRs5PdAixIm2oQheBFDf9+tIuIXePNh8afg+Wo68BjGwIrF/RtRybUU/lUhdEt0JC8y",
+    "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_1786612581.json b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786612581.json
new file mode 100644
index 00000000..9a439975
--- /dev/null
+++ b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786612581.json
@@ -0,0 +1,10 @@
+{
+  "id": "81915847-1a38-40df-8abf-c80601af2708",
+  "name": "oev-2025",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHH9K4RllKLAUZLLCiWNcqzWrb06dk65zZ5JdUdoqvUfiYC/as="
+  },
+  "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 c009e02f..06d71b9c 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:U1RSTQEWxydkXFJOlPPVayNXOFmyyq35Dya0eAznOVbeR8rvs4Gj"
+    "password": "ENC:v1:U1RSTQEXu6efNaFJ/NHu2TbD0tdU0cW1NiBMkSZCi3Tprnm6tpou"
   },
   "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 2bed0f57..f6b74bfd 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:U1RSTQFrHmpkNM075VGDlwTb6+bOBD7VhtryI5p2DLS1v64JlwXX6rFxQ17GzalyW4/lKwXDhZhQhAlifdYS1xXL3iLf/Ds+y6A80RCn+x57IS8a0L9gLuEQodSWfOjXGd5iY5zFFawh7TDdIBrsz8edjUN0M48BT1IXT52YjrMFYG1WJo7cNPljrIDUUVio75x5ttmZF/NzwHyORfttzPsVukp96p64gNXOLGkbSYQLV1XeUtA7UQFJDxOFCzCGPtgy8X0nxD+l59tFzKi6Leu1NwrX0JoGUeHqljgWWnOFOyMEI33JzCxRNl9Evi+u63bK/haTBs7IshlFE9WQ1+NO0+xdEIgVdwsz4Be1x4sBKywJ6H7NRv9rouedQX1kH/YlzXh3GT89C4APK7RRsM+yclL4Wt4fZ5Hv3pUlOM/tErHx7R4ZUbaYtmqutcLAqgELHTj4O0hHpVXku1XV/6d0ECw251+Yj+blGBWYbZZxBAV/UeDmCbNqz6Nymi1XszzhtkzF5+jMMqRs5PdAixIm2oQheBFDf9+tIuIXePNh8afg+Wo68BjGwIrF/RtRybUU/lUhdEt0JC8y",
+    "private_key": "ENC:v1:U1RSTQE1670V8T8z5DPwnbB6CF2Zs9Fd+eCUEjAFRiPDPVJeB9mKJL0px7y5XWRhlRjy+H/rz44wIXMXnWdeJd1YJPKl3i+1oqRZT84P3M0QbndemspWqis6HSbmsHsxiDqdB3S1kHrPor4Rfe/Xwu9r8OLR3j9xD+kNQ0ztQuM2xyUbWABgm5KIBi0HvMxnIj9408xNRwPe9rTkUcwNujK4IHkuuwf27yQZj0pliuQrgFycNrPul9b2OgDwoYgPKwK7d2X/gIxY5DVBed0X24dXdV2jV+BTm1oUbS3yXeDdrXmjF+fg+SUWDxkgskGM0SDLsoSySc/BA0B8qtSYQmZxmVeYKB8ai30UDB32zz8NSLP6WNVxxx+f6/Y87n0YArLtmtmjQS78Xs246dCpmPnrdi4Fl8cST95lV+nNOKap6XdZ73+dbYa+O8UzWtkXlR7Jz/zEH6jna0NML/GfqFHIpO+3B7W3GN2ftgdYqc3ahmaQWWaLfRbxfQN1TuD+HqiWh/MYpyI8GGulGxY4XToWj8VmGSiaiGTZwpKiGau3go5+LcNOiWyvlwXwHK+5OF8HFhAryMAL37rZ",
     "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 9a439975..54dda586 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:U1RSTQHH9K4RllKLAUZLLCiWNcqzWrb06dk65zZ5JdUdoqvUfiYC/as="
+    "password": "ENC:v1:U1RSTQHLgusMKy7mp7+RZXrMmPNXT0qvVmlsFWWQ4oJrlfmOUvYrhp0="
   },
   "created_at": "2026-08-13T04:15:22.425983+00:00",
   "updated_at": "2026-08-13T04:15:22.425983+00:00"