diff --git a/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786614229.json b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786614229.json
new file mode 100644
index 00000000..0c509cc9
--- /dev/null
+++ b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786614229.json
@@ -0,0 +1,10 @@
+{
+  "id": "3487a977-1ff7-4ce3-af79-5643f067cea5",
+  "name": "oev-123",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQEIa1pGdWqQPRwAEU4InUfwx9qFvuJ7/b8BRgZdkYGujld8"
+  },
+  "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_1786614229.json b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786614229.json
new file mode 100644
index 00000000..cd6f8c11
--- /dev/null
+++ b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786614229.json
@@ -0,0 +1,13 @@
+{
+  "id": "7db2f101-b275-4525-bff3-e09a7a2ffbff",
+  "name": "oev-private",
+  "auth_method": {
+    "type": "private_key",
+    "private_key": "ENC:v1:U1RSTQELKkbJSl0uTFCFwXe0S71Rme6eo+S5wFstr8O8bYnstqRs0Gjc5sj315An6vbaZlAWOvZAKHhvMh3PLOK/1ZijRHM57BhZ6sB1FD/ImU7zhl9AsJ+nvSLQh/iIdMXcfQSMx8xYqnqVG8Zv8Sl/CYMliSQAOEWpvqA9lojXOWXkA3WZbK4HM7Tfa9Q0zLoHKyYkBzv+IuHNH+JG0QzWQ067UN+vEozVSpaI5d1tFrejzEToCyacMc6i201cRgg9IX+eD0nl58xbqbiD1JWZ4sM/qoA1CmOp6btZ8vZzvlYH95fmFNQp0mQUWMZe2uAp9s12dNBropbh7cWotf1ubdUVlO4b26VPvOurhYreI6JowQ3jYCVIv/EcZpPS9imjf7ZadUapdLKGW4WBB6nP6a2c4IrRYz3YFnXMalFCSA7uphLmd8YTxKpV9YtQLT4E+JYf7dKbgv8CwexwYP45zfdIdZ+DSaAD3LRTFP0cxSKi4439C7LVQIO2bgeSF649ps8fp2HwGyZJiFB81fhv0fKkWombkdsAa5C6l1y9xegUYPnUuUvgNVFQukHvUUikrJxfIdAoIC8t",
+    "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_1786614229.json b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786614229.json
new file mode 100644
index 00000000..c413755d
--- /dev/null
+++ b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786614229.json
@@ -0,0 +1,10 @@
+{
+  "id": "81915847-1a38-40df-8abf-c80601af2708",
+  "name": "oev-2025",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQGzkEHeROYG+YOiL4agyh/anYzv3sH7tsC/nfukJlogvHbcoMY="
+  },
+  "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 0c509cc9..d347115e 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:U1RSTQEIa1pGdWqQPRwAEU4InUfwx9qFvuJ7/b8BRgZdkYGujld8"
+    "password": "ENC:v1:U1RSTQE6/n26X22XRDmxIu6fE5cKbS3PTX2fWiKiebHhrrUrT7yC"
   },
   "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 cd6f8c11..535f8f79 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:U1RSTQELKkbJSl0uTFCFwXe0S71Rme6eo+S5wFstr8O8bYnstqRs0Gjc5sj315An6vbaZlAWOvZAKHhvMh3PLOK/1ZijRHM57BhZ6sB1FD/ImU7zhl9AsJ+nvSLQh/iIdMXcfQSMx8xYqnqVG8Zv8Sl/CYMliSQAOEWpvqA9lojXOWXkA3WZbK4HM7Tfa9Q0zLoHKyYkBzv+IuHNH+JG0QzWQ067UN+vEozVSpaI5d1tFrejzEToCyacMc6i201cRgg9IX+eD0nl58xbqbiD1JWZ4sM/qoA1CmOp6btZ8vZzvlYH95fmFNQp0mQUWMZe2uAp9s12dNBropbh7cWotf1ubdUVlO4b26VPvOurhYreI6JowQ3jYCVIv/EcZpPS9imjf7ZadUapdLKGW4WBB6nP6a2c4IrRYz3YFnXMalFCSA7uphLmd8YTxKpV9YtQLT4E+JYf7dKbgv8CwexwYP45zfdIdZ+DSaAD3LRTFP0cxSKi4439C7LVQIO2bgeSF649ps8fp2HwGyZJiFB81fhv0fKkWombkdsAa5C6l1y9xegUYPnUuUvgNVFQukHvUUikrJxfIdAoIC8t",
+    "private_key": "ENC:v1:U1RSTQFDM/BeBpE0CigydUxflEUoyBjnJGOwfaUKNvgyRubv4U6Yjb8R9UIwfVTr0mXZxGTQsAX/jiJKXfSE1Tx4NoiX1VhXd/qXNdhJHO0+84gBLorsGgWTQ0IwDxtbCzS/5REA90eJekcXxgp4fM6GVd7Wjr03OcZ1oRPcB/L8hu+Qtefeulh0IKsLtqGFv5HRCctp3bs7aFvHGofHvZJMuui04eD+VZfYrb+lHd43rW0lXjEu+7qFs0N2RbYYsLqc9cg9ccb17Gplkjs2d5257QaNEI2Vsj4mqdrU6N1vTTSSd7BcfO2Qg27WZ+d+z1kRQ3Flj8OyLKFdJ57bHw9i5Z6dyn0wMdOj3tSE0c0zTnjhAboImLIhQITZMdq0V0d3AtT1UKbdmtezxePkB/esHptYNYJMArtpSkJpVV5XiNTw7EY7xIa5fspeyMDq0lFu8pi3K5FvMDzSVMckLupBJkdhh+lYWGnSeczL3ceOCK3HvPEPygn9WyXwnJvVdFZBGEfHkkACnpYPfAjVc//91bL9PqUCRQHsjytP3nmFAtiqLVc2VDeN9vLPnzAU3CvVaoh/Tc0rHr/F",
     "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 c413755d..b17acb22 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:U1RSTQGzkEHeROYG+YOiL4agyh/anYzv3sH7tsC/nfukJlogvHbcoMY="
+    "password": "ENC:v1:U1RSTQGc1rR2RJGXSZMWHvjFDidqvNLyDKLW2oGEfwjhEzonq5kGKcc="
   },
   "created_at": "2026-08-13T04:15:22.425983+00:00",
   "updated_at": "2026-08-13T04:15:22.425983+00:00"