diff --git a/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786614350.json b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786614350.json
new file mode 100644
index 00000000..c308a840
--- /dev/null
+++ b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786614350.json
@@ -0,0 +1,10 @@
+{
+  "id": "3487a977-1ff7-4ce3-af79-5643f067cea5",
+  "name": "oev-123",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQFOrDrb8ScoKz+a/rqCw6BlstH6J1j4C8HFUc4oZtYUu6y1"
+  },
+  "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_1786614350.json b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786614350.json
new file mode 100644
index 00000000..d294498f
--- /dev/null
+++ b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786614350.json
@@ -0,0 +1,13 @@
+{
+  "id": "7db2f101-b275-4525-bff3-e09a7a2ffbff",
+  "name": "oev-private",
+  "auth_method": {
+    "type": "private_key",
+    "private_key": "ENC:v1:U1RSTQEXtFGADWQqVJ4rJdWHmnx5cRDRqfZD0GnBnsqS3buKBD2H0tgTcXKyQ5bFnN3MFphRQ5QUI7wqmrwjfhbqV7QeeSjYG/tPQYGHPlDH+IeBNd+PW8lV2ehSrOk8cJ7rR47xWwSQl4VxFR2YoLKpuhZEAB7iiP+bqMsAEBIo0poHVDO7gRyTJQfyA3yf1gEsbURRzDO57ClPqd8LRCqwGB1UAuRKivxWqC+LNL65NsfSP4NZFzLzsQjm+9iCY8LWWXxAJVS6c3d4qTtyw1JfDnDxhGxqHTon7RVm2cW3ylwFlT9gMwSAjeXTjc8TmlpoNeY2TDFR0IdqKM1fnK1IwkI13ToOR7wiljRHEaFMdTX5twBTiJ8JtYuBKiyVnHfA1oFwS1bOLpdY/bK06mDUeIM1LrEEWtwzgijCe+IfWUHl+4XyVG+PI9ao+WcxPJWa9EJNdXS2sAmSlSraJRFFcgr02ldPqwXSfpOk5sHHYaeXmD/uBIbEh4ZNuskWkcjYEem/YgLTotXFK8Pd/fBVgkmQA/LgcO6lbe6KsAVQ7zez2cj5ZHRSYj4W3PVIL0tP/dQFvY3md1bi",
+    "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_1786614350.json b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786614350.json
new file mode 100644
index 00000000..e8246873
--- /dev/null
+++ b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786614350.json
@@ -0,0 +1,10 @@
+{
+  "id": "81915847-1a38-40df-8abf-c80601af2708",
+  "name": "oev-2025",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQEb++knY9o5fOL4fvmqOUBMtEEaM/EMGeIUN304csZxxmO66gU="
+  },
+  "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 c308a840..aacd7eb7 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:U1RSTQFOrDrb8ScoKz+a/rqCw6BlstH6J1j4C8HFUc4oZtYUu6y1"
+    "password": "ENC:v1:U1RSTQGTYM2XBnhXkE71dfxOWIW43fOUILf5VgQ+hs73ctERs173"
   },
   "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 d294498f..954a10b5 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:U1RSTQEXtFGADWQqVJ4rJdWHmnx5cRDRqfZD0GnBnsqS3buKBD2H0tgTcXKyQ5bFnN3MFphRQ5QUI7wqmrwjfhbqV7QeeSjYG/tPQYGHPlDH+IeBNd+PW8lV2ehSrOk8cJ7rR47xWwSQl4VxFR2YoLKpuhZEAB7iiP+bqMsAEBIo0poHVDO7gRyTJQfyA3yf1gEsbURRzDO57ClPqd8LRCqwGB1UAuRKivxWqC+LNL65NsfSP4NZFzLzsQjm+9iCY8LWWXxAJVS6c3d4qTtyw1JfDnDxhGxqHTon7RVm2cW3ylwFlT9gMwSAjeXTjc8TmlpoNeY2TDFR0IdqKM1fnK1IwkI13ToOR7wiljRHEaFMdTX5twBTiJ8JtYuBKiyVnHfA1oFwS1bOLpdY/bK06mDUeIM1LrEEWtwzgijCe+IfWUHl+4XyVG+PI9ao+WcxPJWa9EJNdXS2sAmSlSraJRFFcgr02ldPqwXSfpOk5sHHYaeXmD/uBIbEh4ZNuskWkcjYEem/YgLTotXFK8Pd/fBVgkmQA/LgcO6lbe6KsAVQ7zez2cj5ZHRSYj4W3PVIL0tP/dQFvY3md1bi",
+    "private_key": "ENC:v1:U1RSTQGtmIqZP038YjCZ43wkEC/ZawynlufGWbzemNsXjs8F0lQEuWpD/8T0LnRX6lW4H2tL62L1ar4jAIK+2tiYhN1U6mD7JMSOzPlb5gcLTaZkLctYsVOBicYByzK6fHtWAsTKiZVKDyI0WKhofpcQwS/HcEUdBzw3/8j0b40QJnu/3E6h2UcNF0g/xVn1C7Vbne7R+qYufWxp/ova4ut+NKk3+7UWt1fpdAxILfVv6xke4rIbFxXLWe+1OnozTgrzVnnNtm1avdhKUzNDjTNyDKSgiQ97D7bfGe9XuD8zdDCkfTfm8tQkd4Ht79Xyy1+Hu7EIUQ6O3+uNOz5Ef5GAx5fPtDEslrGB8VENFTktKrX17sbCUSpwOnN6UDvNOvLYDduv/LnrqMfgu8rm8JeEswYicaqQeqSB7FL6Ouul9U6LiEe+EpW7fg2eXynmWWGW8eaEBxREP+PAzsmJG+C5QlCIuNOEsuRyFFcunk0tGCVAPmJ1HQCXdhTUVv35l06Rbzk1kd0negah8tn1QAvcPSebcDm1Sn6qXTxc6xjexw6RIqyHXBolWNpKF5MJT1XgIrYnzZG9r6WW",
     "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 e8246873..f149d4db 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:U1RSTQEb++knY9o5fOL4fvmqOUBMtEEaM/EMGeIUN304csZxxmO66gU="
+    "password": "ENC:v1:U1RSTQHWXbzBI/islBoqXjn2QcgcJRvTurZwB5FqNAabsS7JjR5USRM="
   },
   "created_at": "2026-08-13T04:15:22.425983+00:00",
   "updated_at": "2026-08-13T04:15:22.425983+00:00"