diff --git a/identities/91d024bd-bdf7-4f24-84dd-c9cd37475058.json b/backups/conflicts/91d024bd-bdf7-4f24-84dd-c9cd37475058_conflict_1786685249.json
similarity index 100%
rename from identities/91d024bd-bdf7-4f24-84dd-c9cd37475058.json
rename to backups/conflicts/91d024bd-bdf7-4f24-84dd-c9cd37475058_conflict_1786685249.json
diff --git a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786685249.json b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786685249.json
new file mode 100644
index 00000000..f3c2dbba
--- /dev/null
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786685249.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQGbQGufl9fVyMF1xmV8stEAxCUzC3Hw3k9NKtnpmJhfM1CHKFHEa5w="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
\ No newline at end of file
diff --git a/backups/conflicts/cfcc6e2e-666e-4928-9914-dea57e939bf0_conflict_1786685249.json b/backups/conflicts/cfcc6e2e-666e-4928-9914-dea57e939bf0_conflict_1786685249.json
new file mode 100644
index 00000000..95885b11
--- /dev/null
+++ b/backups/conflicts/cfcc6e2e-666e-4928-9914-dea57e939bf0_conflict_1786685249.json
@@ -0,0 +1,17 @@
+{
+  "id": "cfcc6e2e-666e-4928-9914-dea57e939bf0",
+  "name": "Docker Password Host",
+  "hostname": "127.0.0.1",
+  "port": 2222,
+  "username": "testuser",
+  "identity_id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "group_id": null,
+  "tags": [],
+  "jump_host_id": null,
+  "keepalive_interval": 1,
+  "legacy_algorithms": null,
+  "ssh_config_overrides": null,
+  "notes": null,
+  "created_at": "2026-08-14T05:20:24.764057+00:00",
+  "updated_at": "2026-08-14T05:20:24.764057+00:00"
+}
\ No newline at end of file
diff --git a/identities/91d024bd-bdf7-4f24-84dd-c9cd37475058.json~FETCH_HEAD b/identities/91d024bd-bdf7-4f24-84dd-c9cd37475058.json~FETCH_HEAD
new file mode 100644
index 00000000..b678557a
--- /dev/null
+++ b/identities/91d024bd-bdf7-4f24-84dd-c9cd37475058.json~FETCH_HEAD
@@ -0,0 +1,14 @@
+{
+  "id": "91d024bd-bdf7-4f24-84dd-c9cd37475058",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+<<<<<<< HEAD:identities/a7ca3944-af0e-498b-abd1-6af456468102.json
+    "password": "ENC:v1:U1RSTQGbQGufl9fVyMF1xmV8stEAxCUzC3Hw3k9NKtnpmJhfM1CHKFHEa5w="
+=======
+    "password": "ENC:v1:U1RSTQHm7Qx4E9phmCUzSNZE7ktg7jWT2MZL2VXtUSJkzfQlfjk4OCOcUUs="
+>>>>>>> FETCH_HEAD:identities/91d024bd-bdf7-4f24-84dd-c9cd37475058.json
+  },
+  "created_at": "2026-08-14T05:25:31.913053+00:00",
+  "updated_at": "2026-08-14T05:25:31.913053+00:00"
+}
\ No newline at end of file
diff --git a/identities/91d024bd-bdf7-4f24-84dd-c9cd37475058.json~HEAD b/identities/91d024bd-bdf7-4f24-84dd-c9cd37475058.json~HEAD
new file mode 100644
index 00000000..84dcd01b
--- /dev/null
+++ b/identities/91d024bd-bdf7-4f24-84dd-c9cd37475058.json~HEAD
@@ -0,0 +1,14 @@
+{
+  "id": "91d024bd-bdf7-4f24-84dd-c9cd37475058",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+<<<<<<< HEAD:identities/a7ca3944-af0e-498b-abd1-6af456468102.json
+    "password": "ENC:v1:U1RSTQEj1UPOaYdnAnsH5Gg7MHpiw0wUgzRDpcvXKLw46aH+GHf/Aqe9paU="
+=======
+    "password": "ENC:v1:U1RSTQHm7Qx4E9phmCUzSNZE7ktg7jWT2MZL2VXtUSJkzfQlfjk4OCOcUUs="
+>>>>>>> FETCH_HEAD:identities/91d024bd-bdf7-4f24-84dd-c9cd37475058.json
+  },
+  "created_at": "2026-08-14T05:25:31.913053+00:00",
+  "updated_at": "2026-08-14T05:25:31.913053+00:00"
+}
\ No newline at end of file
diff --git a/identities/a7ca3944-af0e-498b-abd1-6af456468102.json b/identities/a7ca3944-af0e-498b-abd1-6af456468102.json
index f3c2dbba..260289cf 100644
--- a/identities/a7ca3944-af0e-498b-abd1-6af456468102.json
+++ b/identities/a7ca3944-af0e-498b-abd1-6af456468102.json
@@ -3,7 +3,7 @@
   "name": "Docker Test Identity",
   "auth_method": {
     "type": "password",
-    "password": "ENC:v1:U1RSTQGbQGufl9fVyMF1xmV8stEAxCUzC3Hw3k9NKtnpmJhfM1CHKFHEa5w="
+    "password": "ENC:v1:U1RSTQEcyeKSsaxr0+1XqEGSRmnJ32HlR0U4xaMSotpS1fjCKAX0b/tEWHg="
   },
   "created_at": "2026-08-14T05:20:24.759864+00:00",
   "updated_at": "2026-08-14T05:20:24.759864+00:00"