diff --git a/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786612642.json b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786612642.json
new file mode 100644
index 00000000..06d71b9c
--- /dev/null
+++ b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786612642.json
@@ -0,0 +1,10 @@
+{
+  "id": "3487a977-1ff7-4ce3-af79-5643f067cea5",
+  "name": "oev-123",
+  "auth_method": {
+    "type": "password",
+    "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"
+}
\ No newline at end of file
diff --git a/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786612642.json b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786612642.json
new file mode 100644
index 00000000..f6b74bfd
--- /dev/null
+++ b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786612642.json
@@ -0,0 +1,13 @@
+{
+  "id": "7db2f101-b275-4525-bff3-e09a7a2ffbff",
+  "name": "oev-private",
+  "auth_method": {
+    "type": "private_key",
+    "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
+  },
+  "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_1786612642.json b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786612642.json
new file mode 100644
index 00000000..54dda586
--- /dev/null
+++ b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786612642.json
@@ -0,0 +1,10 @@
+{
+  "id": "81915847-1a38-40df-8abf-c80601af2708",
+  "name": "oev-2025",
+  "auth_method": {
+    "type": "password",
+    "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"
+}
\ 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 06d71b9c..130c7612 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:U1RSTQEXu6efNaFJ/NHu2TbD0tdU0cW1NiBMkSZCi3Tprnm6tpou"
+    "password": "ENC:v1:U1RSTQExzHx93gLZvGHPK9Z04lfZWidhwjYZCf1D4TJyivmGyl0k"
   },
   "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 f6b74bfd..e366d08f 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:U1RSTQE1670V8T8z5DPwnbB6CF2Zs9Fd+eCUEjAFRiPDPVJeB9mKJL0px7y5XWRhlRjy+H/rz44wIXMXnWdeJd1YJPKl3i+1oqRZT84P3M0QbndemspWqis6HSbmsHsxiDqdB3S1kHrPor4Rfe/Xwu9r8OLR3j9xD+kNQ0ztQuM2xyUbWABgm5KIBi0HvMxnIj9408xNRwPe9rTkUcwNujK4IHkuuwf27yQZj0pliuQrgFycNrPul9b2OgDwoYgPKwK7d2X/gIxY5DVBed0X24dXdV2jV+BTm1oUbS3yXeDdrXmjF+fg+SUWDxkgskGM0SDLsoSySc/BA0B8qtSYQmZxmVeYKB8ai30UDB32zz8NSLP6WNVxxx+f6/Y87n0YArLtmtmjQS78Xs246dCpmPnrdi4Fl8cST95lV+nNOKap6XdZ73+dbYa+O8UzWtkXlR7Jz/zEH6jna0NML/GfqFHIpO+3B7W3GN2ftgdYqc3ahmaQWWaLfRbxfQN1TuD+HqiWh/MYpyI8GGulGxY4XToWj8VmGSiaiGTZwpKiGau3go5+LcNOiWyvlwXwHK+5OF8HFhAryMAL37rZ",
+    "private_key": "ENC:v1:U1RSTQEK/PexGgZUXnUS6T66+ysv4JULC1N4v3y1AcuHZMBbkF3NC8Wz2FhAzMW9SlbqmjhMRfBnCg9Kcs+Qt/LnRnfrag0ufWUbszfuOJKEyeClkjti+G/Kre6UrmzqWJ/MiFn37mVxU9MdKMkIr1rHBOc8Brcnvv1L8oVAzkZt0AfVNtrd6FgccfYSwTtWR1TrJo8fRGsgslaIIdZpwx7AJPuOi5bGuuKkDz/l+xCq+e1PYoBQQFbCjgyG57AAO8nx4N6enKs0+KqcxN6ZNO6Xh6retyA0i8kD6gUFOvfUZhXRYggm4f2x3EXFdheIjG/1uKhOjjK0TOaSTHaDH4+lPXxm9Cpv/JWH7oyQF4H0tMNIU/cyYfFXL6ee3BqmT/xw3BKdCdNjLcpcBBo1hrWBTSU/tt64K2VNFzyPK9GHnk8sVGtLXr+AtR1/wgcJtI6WfC+eQV1JlapgD4gmY44fNLXDg4vP8M8zqb4rFTM/xXhYFDRcb1T5Y6hIol7yjBBSH9CnCXQFu/U3TFBBIhINyAYO6b9ypD36Mnee850UNqROt+ozh+jcGu9StfGcfaeDxPDXEARMtDZv",
     "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 54dda586..2b4ef18c 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:U1RSTQHLgusMKy7mp7+RZXrMmPNXT0qvVmlsFWWQ4oJrlfmOUvYrhp0="
+    "password": "ENC:v1:U1RSTQEK5cH/hbeHZ8nve7ywU4pBanfj/TQLT8X8Tcj6/aLGHEvPYKU="
   },
   "created_at": "2026-08-13T04:15:22.425983+00:00",
   "updated_at": "2026-08-13T04:15:22.425983+00:00"