diff --git a/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786614957.json b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786614957.json
new file mode 100644
index 00000000..5d82b65e
--- /dev/null
+++ b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786614957.json
@@ -0,0 +1,10 @@
+{
+  "id": "3487a977-1ff7-4ce3-af79-5643f067cea5",
+  "name": "oev-123",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHdqq6yiOMaUMy1jCocuhPboRAY4yV7admws2v1Pfrqmk91"
+  },
+  "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_1786614957.json b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786614957.json
new file mode 100644
index 00000000..504e63f6
--- /dev/null
+++ b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786614957.json
@@ -0,0 +1,13 @@
+{
+  "id": "7db2f101-b275-4525-bff3-e09a7a2ffbff",
+  "name": "oev-private",
+  "auth_method": {
+    "type": "private_key",
+    "private_key": "ENC:v1:U1RSTQEttwrBweFmt2MC1cnz/uWeTxj0qSNvvYBT4Q5W81Vem3Ra+moHyVWvnr/YL6YYDczyp9cAhluDkm8dvaLxDjFlUkPrwiviXQV3d3kcRi7Qg5RRpxo8TSDx7wQIk/R/CCaj2n9iUUj6jD7JhcF8zPPk09eMiWU/ZVY8Dz7FTQh1Ts22UsfD0ztZIaQ9R8Rooj0a94mQFlUFLMX+fNxa3RKIN818eHuaZz2aGZaNHA081nzN+OkRHtgLECtmfb2c2Jfap1D6eW0P3mrQ9/hfhTne5/UbKgCNIe+qAWBk6z2jBPe447dmZd3JcUcU284Msb1ROo8F8mGqHir9mkDdN2491mJD4l6/k1C8N1LN5vib32I0WCMqO91E3WTsgONCjabvByx7KChx3vZ3HHMT+EITK3zETm7WPk9AV3bEqebjz9OLQcN9B8Pmr8kPGiTc8t+wzkCh0G5E+m7iMc7SpQOqBe/qfeRZDtauHKirYEUGfsA+NGK+SpKcCVm/zoUdgdP+f05roYfNQ+eGhzUgB26jF7EJS+Y6vot7x7qWu+OxSEZA1SZfJN3TXQkmMopT/gbQXq8gLRvE",
+    "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_1786614957.json b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786614957.json
new file mode 100644
index 00000000..404e62d7
--- /dev/null
+++ b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786614957.json
@@ -0,0 +1,10 @@
+{
+  "id": "81915847-1a38-40df-8abf-c80601af2708",
+  "name": "oev-2025",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQEbOEukJs158JQfa7pa44jnkydVRlKd4VHEIraW/8nPBJJqqjc="
+  },
+  "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 5d82b65e..b6107424 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:U1RSTQHdqq6yiOMaUMy1jCocuhPboRAY4yV7admws2v1Pfrqmk91"
+    "password": "ENC:v1:U1RSTQHBmuVk1zHvm9p/0FPzZgRFVi/sz9mK2CruUjtvPcGz79la"
   },
   "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 504e63f6..79efdf91 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:U1RSTQEttwrBweFmt2MC1cnz/uWeTxj0qSNvvYBT4Q5W81Vem3Ra+moHyVWvnr/YL6YYDczyp9cAhluDkm8dvaLxDjFlUkPrwiviXQV3d3kcRi7Qg5RRpxo8TSDx7wQIk/R/CCaj2n9iUUj6jD7JhcF8zPPk09eMiWU/ZVY8Dz7FTQh1Ts22UsfD0ztZIaQ9R8Rooj0a94mQFlUFLMX+fNxa3RKIN818eHuaZz2aGZaNHA081nzN+OkRHtgLECtmfb2c2Jfap1D6eW0P3mrQ9/hfhTne5/UbKgCNIe+qAWBk6z2jBPe447dmZd3JcUcU284Msb1ROo8F8mGqHir9mkDdN2491mJD4l6/k1C8N1LN5vib32I0WCMqO91E3WTsgONCjabvByx7KChx3vZ3HHMT+EITK3zETm7WPk9AV3bEqebjz9OLQcN9B8Pmr8kPGiTc8t+wzkCh0G5E+m7iMc7SpQOqBe/qfeRZDtauHKirYEUGfsA+NGK+SpKcCVm/zoUdgdP+f05roYfNQ+eGhzUgB26jF7EJS+Y6vot7x7qWu+OxSEZA1SZfJN3TXQkmMopT/gbQXq8gLRvE",
+    "private_key": "ENC:v1:U1RSTQEbIksRZArP1gPlIpDsKd9eoEOaYsKZG2n9cwEi7cmWlKDgKQihA5ppLak1nSQ+Bt86rxh8EWKhQHFC2jgrOoyOoLW3LBqIIZyKaiCuTsUXhBTiJC37Ex7eaGPJuzrpbWR57/p52IdG3MR+9kdxcwbzu/LxCk0V18itt3jbOOrgzW1qervvYu+e/i5BKq3mp0XMdQlgPbsNLNFVS0xTb4O1goXdgyOLxVf9kb0CBTyuy4+IwywGBs/l3iyqKKxfo4JLGoqXlH7NAatP4IeEeApSwz4eKzn6DgE1Wb1OFupTNCvOrXVti05o/KUHNyYPNbv+PcpBOzJ30g9n8q5tYgZ/rl8t6aqVaBgS17+Dt68MKSTDo2x4M/00DUclhi3PUKo4Ou3CRE4tjld16pt8Sep8ZL7v94KoEm99tp4VBEwSLZclODW4A/LZA1OdiozVeWZBPJ1QpaxyGI2sOT1VLKxsv9MORhFPLHmWZLrAWO1lH78mSzISCVM7qSccePeIV1QNPNVSeWXSw2y53kXpwx3EgjC1EcH7K1sjfHxt45WoNcsULsrBM5qT84JyuRWr8rC5So0Khz/a",
     "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 404e62d7..783979f0 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:U1RSTQEbOEukJs158JQfa7pa44jnkydVRlKd4VHEIraW/8nPBJJqqjc="
+    "password": "ENC:v1:U1RSTQHIkKknfQ/K0KzHu4J8bX1117iO+68fRwGqoq+PDOGB7pWevys="
   },
   "created_at": "2026-08-13T04:15:22.425983+00:00",
   "updated_at": "2026-08-13T04:15:22.425983+00:00"