diff --git a/hosts/77a6e3b5-ce22-4359-b0a8-66aabc7dd9c7.json b/backups/conflicts/77a6e3b5-ce22-4359-b0a8-66aabc7dd9c7_conflict_1786685065.json
similarity index 100%
rename from hosts/77a6e3b5-ce22-4359-b0a8-66aabc7dd9c7.json
rename to backups/conflicts/77a6e3b5-ce22-4359-b0a8-66aabc7dd9c7_conflict_1786685065.json
diff --git a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786685065.json b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786685065.json
new file mode 100644
index 00000000..f2c67587
--- /dev/null
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786685065.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQEj1UPOaYdnAnsH5Gg7MHpiw0wUgzRDpcvXKLw46aH+GHf/Aqe9paU="
+  },
+  "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_1786685065.json b/backups/conflicts/cfcc6e2e-666e-4928-9914-dea57e939bf0_conflict_1786685065.json
new file mode 100644
index 00000000..95885b11
--- /dev/null
+++ b/backups/conflicts/cfcc6e2e-666e-4928-9914-dea57e939bf0_conflict_1786685065.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/hosts/77a6e3b5-ce22-4359-b0a8-66aabc7dd9c7.json~FETCH_HEAD b/hosts/77a6e3b5-ce22-4359-b0a8-66aabc7dd9c7.json~FETCH_HEAD
new file mode 100644
index 00000000..6f94ef53
--- /dev/null
+++ b/hosts/77a6e3b5-ce22-4359-b0a8-66aabc7dd9c7.json~FETCH_HEAD
@@ -0,0 +1,17 @@
+{
+  "id": "77a6e3b5-ce22-4359-b0a8-66aabc7dd9c7",
+  "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:23:21.962148+00:00",
+  "updated_at": "2026-08-14T05:23:21.962148+00:00"
+}
\ No newline at end of file
diff --git a/hosts/77a6e3b5-ce22-4359-b0a8-66aabc7dd9c7.json~HEAD b/hosts/77a6e3b5-ce22-4359-b0a8-66aabc7dd9c7.json~HEAD
new file mode 100644
index 00000000..6f94ef53
--- /dev/null
+++ b/hosts/77a6e3b5-ce22-4359-b0a8-66aabc7dd9c7.json~HEAD
@@ -0,0 +1,17 @@
+{
+  "id": "77a6e3b5-ce22-4359-b0a8-66aabc7dd9c7",
+  "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:23:21.962148+00:00",
+  "updated_at": "2026-08-14T05:23:21.962148+00:00"
+}
\ No newline at end of file