diff --git a/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786615808.json b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786615808.json
new file mode 100644
index 00000000..ea827ce3
--- /dev/null
+++ b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786615808.json
@@ -0,0 +1,10 @@
+{
+  "id": "3487a977-1ff7-4ce3-af79-5643f067cea5",
+  "name": "oev-123",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHEUh8gX3dEt7e53gMgMOkcYyHwA76YEj1z0h9v1gvLO5CX"
+  },
+  "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_1786615808.json b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786615808.json
new file mode 100644
index 00000000..cd08e83f
--- /dev/null
+++ b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786615808.json
@@ -0,0 +1,13 @@
+{
+  "id": "7db2f101-b275-4525-bff3-e09a7a2ffbff",
+  "name": "oev-private",
+  "auth_method": {
+    "type": "private_key",
+    "private_key": "ENC:v1:U1RSTQG/aor75OXSCggXRDE2PttNyga+fMUhZJqE8mVjKGKbAH2ZtZuqO+pdT/RPXxRO5fCQ+B9gg9p/Cc+ft1GAlhw6lDZJfsf8uCrNi6mRsFeGjZDnWUjMvpTxTq7JgKkhgX0vhubDE4aiWpNU4TLlszJckmZToKCbKOYUbkQq6hh7V1YVyrSEBlVaiyEMfIa0yIW14ys8v5yT3TkI4PeAJi0AyvQE+D0+U1/y5Xz9xlwOJmROQB7kQkfV7cPBUIS7j7/VBUxIjWhwEjGlv0HfoujDMkrjPDjSaDkvW9kXFy3RjdJB55UiRgGhgylmDZAZXvFGMALbMMinbbIpL19VYa1gby7VM2kEe13co43VOuJ9BgYgDggULRNt2sfdgzhTPzFfRRh0hzmH4ovqMbDrovIfiFY7YERVwfg1Hmk17EAgYNU+qM4OVeaarelGZLK1uTIeWMN+EdcnMVJksXnU8Eu4S2yWF/qui7AaxTYUm1EM4KbKbsW8Utb8ArVNYKXq4OBCJz0MxVcnH5wmq2yPNIAfAn1ldCy0EykjA6wA8HU+SM/c3nNVCdEnCQDByDroHEZJlplIPM79",
+    "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_1786615808.json b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786615808.json
new file mode 100644
index 00000000..f987843e
--- /dev/null
+++ b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786615808.json
@@ -0,0 +1,10 @@
+{
+  "id": "81915847-1a38-40df-8abf-c80601af2708",
+  "name": "oev-2025",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQEo+TuIkQabMOjpqmcUqgq9yZhdtR96I6Oi8LHqvnilXDizNow="
+  },
+  "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 ea827ce3..9076f9fe 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:U1RSTQHEUh8gX3dEt7e53gMgMOkcYyHwA76YEj1z0h9v1gvLO5CX"
+    "password": "ENC:v1:U1RSTQG3ogEEnQGdIVy/9t+Tmbrbn5a7bUioLnIz9YZqPYsstj4E"
   },
   "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 cd08e83f..b4b4bb12 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:U1RSTQG/aor75OXSCggXRDE2PttNyga+fMUhZJqE8mVjKGKbAH2ZtZuqO+pdT/RPXxRO5fCQ+B9gg9p/Cc+ft1GAlhw6lDZJfsf8uCrNi6mRsFeGjZDnWUjMvpTxTq7JgKkhgX0vhubDE4aiWpNU4TLlszJckmZToKCbKOYUbkQq6hh7V1YVyrSEBlVaiyEMfIa0yIW14ys8v5yT3TkI4PeAJi0AyvQE+D0+U1/y5Xz9xlwOJmROQB7kQkfV7cPBUIS7j7/VBUxIjWhwEjGlv0HfoujDMkrjPDjSaDkvW9kXFy3RjdJB55UiRgGhgylmDZAZXvFGMALbMMinbbIpL19VYa1gby7VM2kEe13co43VOuJ9BgYgDggULRNt2sfdgzhTPzFfRRh0hzmH4ovqMbDrovIfiFY7YERVwfg1Hmk17EAgYNU+qM4OVeaarelGZLK1uTIeWMN+EdcnMVJksXnU8Eu4S2yWF/qui7AaxTYUm1EM4KbKbsW8Utb8ArVNYKXq4OBCJz0MxVcnH5wmq2yPNIAfAn1ldCy0EykjA6wA8HU+SM/c3nNVCdEnCQDByDroHEZJlplIPM79",
+    "private_key": "ENC:v1:U1RSTQHYiAIou/++raM3ZZm3xfjV1cImEY+tRAc+SKMW0xXPdXIG+897oD3yQp0M7Y+Wv3AqTTDeIiPVzqAR7MgcET2muUBSjLizTVojzTT0NmezRGExp9+mT4bEHzOaPVeEWxkmHw/lFCeGVoEyXEoJUmMuA+Eg51buAXOqsTcZsW2JKBBMTknz0OCh8tEi7SrTWI4QzCXoh8ACVlN3+vZlmKZmRJYoA222lnceLW1sNL30WH5mxiU+CqAkpQ6TtG8Ih4OgkCyMtxro+q1K1bh+da7+vJgEFr+mVLLG878YSlIGvt2/dKl2kL3CHGdYnJ6NYwX7Oh6Voh68YycmrL1K070gnhV3YaPfvF7XRXgEDKYdlpIm/KOlL2wkatG95ODil8ngkW98urSkmmj/0GcNXatrCdG1FBVBa9e5YaahDsreZ7/i1E3W3rJT51aPLaNyOcPnfJkImi6dxqZaEJp27hessRTDnt8rYIFC7pH1+MyK7ZqjPj/7Xissn1lRA836IvSTUYQKCpSkhXm+nnAQAvOz+FiJoFs+H2gM24A41nhxe1TlzY8Ta3a5V4z/PXPKGDIA4UnlaJ9E",
     "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 f987843e..d4de44fb 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:U1RSTQEo+TuIkQabMOjpqmcUqgq9yZhdtR96I6Oi8LHqvnilXDizNow="
+    "password": "ENC:v1:U1RSTQGJA5hJzSkybmqZYRHnc16aUhLKaYboS9IzR54ANdAe2ZND4jg="
   },
   "created_at": "2026-08-13T04:15:22.425983+00:00",
   "updated_at": "2026-08-13T04:15:22.425983+00:00"