diff --git a/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786612704.json b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786612704.json
new file mode 100644
index 00000000..130c7612
--- /dev/null
+++ b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786612704.json
@@ -0,0 +1,10 @@
+{
+  "id": "3487a977-1ff7-4ce3-af79-5643f067cea5",
+  "name": "oev-123",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQExzHx93gLZvGHPK9Z04lfZWidhwjYZCf1D4TJyivmGyl0k"
+  },
+  "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_1786612704.json b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786612704.json
new file mode 100644
index 00000000..e366d08f
--- /dev/null
+++ b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786612704.json
@@ -0,0 +1,13 @@
+{
+  "id": "7db2f101-b275-4525-bff3-e09a7a2ffbff",
+  "name": "oev-private",
+  "auth_method": {
+    "type": "private_key",
+    "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
+  },
+  "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_1786612704.json b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786612704.json
new file mode 100644
index 00000000..2b4ef18c
--- /dev/null
+++ b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786612704.json
@@ -0,0 +1,10 @@
+{
+  "id": "81915847-1a38-40df-8abf-c80601af2708",
+  "name": "oev-2025",
+  "auth_method": {
+    "type": "password",
+    "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"
+}
\ 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 130c7612..24bea889 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:U1RSTQExzHx93gLZvGHPK9Z04lfZWidhwjYZCf1D4TJyivmGyl0k"
+    "password": "ENC:v1:U1RSTQGtWlTvRCd7fCP5iS51eAqqF+S3tVIS6iAKdrf03eA6m2O0"
   },
   "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 e366d08f..0c9638ce 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: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",
+    "private_key": "ENC:v1:U1RSTQGfKnigjdSyEJR9QQFFRm001RLJO+P+FVEuihUdfw4MRV7Nt+84TxwQV01+we1I674ugHOLFS9wrzsmsypYDNd+/teaH6tZ3UChWVEVFxqAhg8ASRhIBSUJB64hkitDFoxXbC/1Sa1nCVA7Fu5WLWyDiqEq+xVEFsP5pr6Pm0e2kTM+U7ZjoNDo7kpUr8OAcFAh/V37dRLxfHbso2Hk+tZ9tZVW1nP6HoLaSVBEYWjedVJEtjXNd6vvt8IElCDCCcbpOsPXBGRhhronOyHcQbXYUfOBkAdkPN0pP4UCiBKtDY6yv7zBjtu7NR57dkD3YSk6HQ61lPRzcrcThTwjeeL2VQbibGbxSOhOAGC8TEcOjTcV+eiBJA9fHKdPUr2t1gJpFv5Dm9aX1Fo4nFRH2VOi1YJKmT+hZkuLVMBJkAYT0t3cA3he/PG3CzXsSKm8qhi/ZZJ6gmf6z/YvEHW6gaotYFH0IHm0g73X7Z86iaDViNiVUadz8JkyhMNmf3LKsDxWxQibT9woxa2YwUJGWMTKbeaZtPHTyx4XEAGCJnZ4KMQjhCfmTpuEKomNFnycD1QzxIrks3Bc",
     "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 2b4ef18c..2c4efae3 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:U1RSTQEK5cH/hbeHZ8nve7ywU4pBanfj/TQLT8X8Tcj6/aLGHEvPYKU="
+    "password": "ENC:v1:U1RSTQGH5YMyP+JBwrEXZPSCfM3jsFS3cqHjbNCCTPHTmwcEF9AV2D4="
   },
   "created_at": "2026-08-13T04:15:22.425983+00:00",
   "updated_at": "2026-08-13T04:15:22.425983+00:00"