diff --git a/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786615200.json b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786615200.json
new file mode 100644
index 00000000..bf6d869d
--- /dev/null
+++ b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786615200.json
@@ -0,0 +1,10 @@
+{
+  "id": "3487a977-1ff7-4ce3-af79-5643f067cea5",
+  "name": "oev-123",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQEH270tuEePIpVd4w80sjWm6LJEaT6dJCYHKZZjG9GL1Hu3"
+  },
+  "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_1786615200.json b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786615200.json
new file mode 100644
index 00000000..aca72bc6
--- /dev/null
+++ b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786615200.json
@@ -0,0 +1,13 @@
+{
+  "id": "7db2f101-b275-4525-bff3-e09a7a2ffbff",
+  "name": "oev-private",
+  "auth_method": {
+    "type": "private_key",
+    "private_key": "ENC:v1:U1RSTQFigBoawO8rWy+jk8CBv4yPnrDaNsxsEcrq6GBu7WJ5k8htHToPT1C5EJ7/icA807IGI4pAlrKM1QT9IpWEXSNRsqFwR0eYNbdlUv3DymLwkWJfC9SZlkOgC7CveM1GXUxiNV5BSeUD4dJxwW28Jx7pgYSaPTPQFKYMRey+IhRi8EqABs/ok/1qZ2ypexWs+h+1zWgzTR0YDYe3qo7tT/2BwIebhVZ8aBF1WOfr7CEEZ8MYV8eANKhrLonygZXtLFvY47KimGpwOieFWHiApaqSQXuVRU7Wk/E1FGU+tKkWZhPQiCVissh8r5yDklVwu7Ct0+nIas28fasKyrmULAMwC1flOXtC+jHZ9haijb8DLeRTpeO3nc8EsT9Fvt0rC14PrGPOvEm/sxrwh+ybv0ChIEoMiotYZ7guFzTaXzQ+WVcIDdqW2XEvMb0rv79NBdgX1BroWEI+UY1IWJLoK0hIWEDytqnKnVymF+PYOniaHX4tEgnqrvNGn9l8gQLzCcdZyaEfrN6Ijx/7ibOwigiokj8KE2QxWAF50ya/wSRLxb64ey0BMQQ2me4MT/BxSTjCXtrVkyIl",
+    "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_1786615200.json b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786615200.json
new file mode 100644
index 00000000..e71f9415
--- /dev/null
+++ b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786615200.json
@@ -0,0 +1,10 @@
+{
+  "id": "81915847-1a38-40df-8abf-c80601af2708",
+  "name": "oev-2025",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQEvPD4GtLF9jXZm37dntfmrATk90i2AR5j47bzXE5Sglqb1S94="
+  },
+  "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 bf6d869d..2ccdeb2c 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:U1RSTQEH270tuEePIpVd4w80sjWm6LJEaT6dJCYHKZZjG9GL1Hu3"
+    "password": "ENC:v1:U1RSTQHpqZq/nPJTJMUo4qfUISRcvlTdaGUklRMxIPCcM31+XGhc"
   },
   "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 aca72bc6..e15880ce 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:U1RSTQFigBoawO8rWy+jk8CBv4yPnrDaNsxsEcrq6GBu7WJ5k8htHToPT1C5EJ7/icA807IGI4pAlrKM1QT9IpWEXSNRsqFwR0eYNbdlUv3DymLwkWJfC9SZlkOgC7CveM1GXUxiNV5BSeUD4dJxwW28Jx7pgYSaPTPQFKYMRey+IhRi8EqABs/ok/1qZ2ypexWs+h+1zWgzTR0YDYe3qo7tT/2BwIebhVZ8aBF1WOfr7CEEZ8MYV8eANKhrLonygZXtLFvY47KimGpwOieFWHiApaqSQXuVRU7Wk/E1FGU+tKkWZhPQiCVissh8r5yDklVwu7Ct0+nIas28fasKyrmULAMwC1flOXtC+jHZ9haijb8DLeRTpeO3nc8EsT9Fvt0rC14PrGPOvEm/sxrwh+ybv0ChIEoMiotYZ7guFzTaXzQ+WVcIDdqW2XEvMb0rv79NBdgX1BroWEI+UY1IWJLoK0hIWEDytqnKnVymF+PYOniaHX4tEgnqrvNGn9l8gQLzCcdZyaEfrN6Ijx/7ibOwigiokj8KE2QxWAF50ya/wSRLxb64ey0BMQQ2me4MT/BxSTjCXtrVkyIl",
+    "private_key": "ENC:v1:U1RSTQEMzqY46+vQ6Sfy9W97KEfM/RaqYckR1MqByUyJWInJol1iCv5ScnAFcjO4rXxJ1TJaKXhLmAKb9Rujq35lKh74cYC4tJivrDQoCd9PZRdZ7UZErUiTiC5NHN6mIttyjhJgXqCi22rjylvg8+O+TPD2NRChivScnUyG615opeKscpIXzUEwMAe4PpTBMISrIyvIx9TJ/Y7kxamNGtzigQn/hqBxH5i/pL0nGa//47sSz508NmyvsvLgH8S85AS/r0tTbRLr+p0ubG3LyNEqmh57FPc+ywD7pnLCvW60m6F2Naf7DS5d9G9VZxVn9jFiPtukbTMxhCUnD0orNtKBDf7k515FTzWtuMMAVxKwAinjzcPu9fk0zexi+98R6VmyDum61T7r03qSqrzlYwiZZOJJFs/UUwzcjCKB+fo3ZatNT7m82yGZoWpusBnorepqkgx7QJVq1TnCQ1Z0F+uCM5qleFVEL5ZGZdzv0Tj2VZLfSRZeTpHMn4PF4ymPjYzPsEBkBezTMHrOVDUYybd7bEx5+FXF89LLRBqYf6JX6GYscqq+qQxl/yi91LOE2rok3GdJe8WfnqnW",
     "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 e71f9415..afb87930 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:U1RSTQEvPD4GtLF9jXZm37dntfmrATk90i2AR5j47bzXE5Sglqb1S94="
+    "password": "ENC:v1:U1RSTQFYQbzw47K2qFmBgfyYrqWaHZ/P5qV/gEKPlS5KRKoeCtJdHSE="
   },
   "created_at": "2026-08-13T04:15:22.425983+00:00",
   "updated_at": "2026-08-13T04:15:22.425983+00:00"