diff --git a/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786614046.json b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786614046.json
new file mode 100644
index 00000000..0756e451
--- /dev/null
+++ b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786614046.json
@@ -0,0 +1,10 @@
+{
+  "id": "3487a977-1ff7-4ce3-af79-5643f067cea5",
+  "name": "oev-123",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHkJ7/h2idzxWJtd3Wc05UfV4IDz66jHw477OmNEPVqvH/Q"
+  },
+  "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_1786614046.json b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786614046.json
new file mode 100644
index 00000000..68bd9016
--- /dev/null
+++ b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786614046.json
@@ -0,0 +1,13 @@
+{
+  "id": "7db2f101-b275-4525-bff3-e09a7a2ffbff",
+  "name": "oev-private",
+  "auth_method": {
+    "type": "private_key",
+    "private_key": "ENC:v1:U1RSTQEufsFyo9u9oAsCWT+CJzPbNX81+w8fDijtDZVfdTsZ6CbuJjyWjnrp4WBIxHRMUeSCVrcwmfOXo73Ga4cGVkdjZ+clNUJ+AyJM5V71DsWhnAIRVKa6BA9ioq+VoOxSPYXAGWrQQ79x0Ek8IWkazDrbywUwRQoKbRPA3wMW++3Q1WNv87BB0JlU161y2E3lBMHdI8SutMZGHNWRnHfpVUezE7FGfyOyqE2k3YbkzSe0bIagxuGFKV7FKS1xqYBFJjIgv0zpB9cX5a+l6ZBE6j8jZPNa19ymWgJZzWMWgV9YAsVECC/CGFv1AYjlyE6tcPPII/bsbkilywaPIFtWaaliOBYftzf1IVuxhP/XR/BepdnXUhXlHyKHbD2Wl3tTx0BSzJ4g2huYGWehTC7mCpvTi67GzP3Ykom6eTP3+5rTXRBlvNCeCGaOnjxo/ik++E+/N5fp0IMkGRhq771lo2Fl+jYH708huiOuH0QpWIRBDoEXDz/l9FGzJt4tFA43zbzlqMTsDW4tnxsFi3/uSOpwOtek5VvnRy+WoXKjMZ8OQxQXig0FkVGrurM81nsesy0zLdzt24Ma",
+    "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_1786614046.json b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786614046.json
new file mode 100644
index 00000000..3451d792
--- /dev/null
+++ b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786614046.json
@@ -0,0 +1,10 @@
+{
+  "id": "81915847-1a38-40df-8abf-c80601af2708",
+  "name": "oev-2025",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQEQeHsnYTVYIKo/igqXix2y88J0sY3Xbb2D2v9aVe34OLKoJTg="
+  },
+  "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 0756e451..f1643517 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:U1RSTQHkJ7/h2idzxWJtd3Wc05UfV4IDz66jHw477OmNEPVqvH/Q"
+    "password": "ENC:v1:U1RSTQG83XE130GltFoTNRUnLY6n6xwrn3IfSy1DhgzOaIbv65BP"
   },
   "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 68bd9016..e8d083b4 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:U1RSTQEufsFyo9u9oAsCWT+CJzPbNX81+w8fDijtDZVfdTsZ6CbuJjyWjnrp4WBIxHRMUeSCVrcwmfOXo73Ga4cGVkdjZ+clNUJ+AyJM5V71DsWhnAIRVKa6BA9ioq+VoOxSPYXAGWrQQ79x0Ek8IWkazDrbywUwRQoKbRPA3wMW++3Q1WNv87BB0JlU161y2E3lBMHdI8SutMZGHNWRnHfpVUezE7FGfyOyqE2k3YbkzSe0bIagxuGFKV7FKS1xqYBFJjIgv0zpB9cX5a+l6ZBE6j8jZPNa19ymWgJZzWMWgV9YAsVECC/CGFv1AYjlyE6tcPPII/bsbkilywaPIFtWaaliOBYftzf1IVuxhP/XR/BepdnXUhXlHyKHbD2Wl3tTx0BSzJ4g2huYGWehTC7mCpvTi67GzP3Ykom6eTP3+5rTXRBlvNCeCGaOnjxo/ik++E+/N5fp0IMkGRhq771lo2Fl+jYH708huiOuH0QpWIRBDoEXDz/l9FGzJt4tFA43zbzlqMTsDW4tnxsFi3/uSOpwOtek5VvnRy+WoXKjMZ8OQxQXig0FkVGrurM81nsesy0zLdzt24Ma",
+    "private_key": "ENC:v1:U1RSTQG+fBcrNS8XzyAY7MENq5P2KkT0Gkd8cy/U41R6rwIa5eyKy/JBMhiBABa5QSKXXDCjn3nEwk5M3BjUsbGBzuYONkhT6MTWj/2JxeVcD2hf2hPWOIaRuJ+aliDBCCNTU7PF0ABYfxoIcuUxc8Nd8dMGlEkfu6lHsK0U8ohCo2dLoULSaV6SuZUI3LLGR2K6umzhbcxPKSf+GxvxJja8Xsq/kVEhyOoRGKj6yODGCbjr8Rh9n+hqXwgzLkE+fbhL6P9nxY6c8HZnxa/jTDKtpyTIxg0BHDW9xzX4BH4c6X8XKIWMKET6tLlEa2fnPoyrZneILyMetDtWWpanbCTqSEsKTMkL3Ck+IyEQrB5uhwIzB9f8BcPXtN6D61KTwJz8eKB5vaVic93osS5vZ3n5YaDia43veRdtxbdMoE2649iES+a+HsJABIrN3wS6BCQqrRQeGoRhJPoX+bF+NLpfhm8oN7YYiLJIJwh6h6El8FG8Pya4HEcH/GJyMkScS6OcHgY+ke6DzRxthecLb9Dw+QxD9heHyl3qPZpz4XtXV6y4yGans/3eweCz/Dt9gYBaZ7SzqPxYJtQW",
     "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 3451d792..b75f359c 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:U1RSTQEQeHsnYTVYIKo/igqXix2y88J0sY3Xbb2D2v9aVe34OLKoJTg="
+    "password": "ENC:v1:U1RSTQHr6AyndARn1R8v74Cccq4+tQCi+1Zh18oNHMr0+T+fET/q5Ac="
   },
   "created_at": "2026-08-13T04:15:22.425983+00:00",
   "updated_at": "2026-08-13T04:15:22.425983+00:00"