Merge branch (resolved)

Auto-sync: update local configurations
2026-08-14 14:27:41 +07:00 · 2026-08-14 14:26:47 +07:00 · 2026-08-14 14:25:46 +07:00 · 2026-08-14 14:24:46 +07:00 · 2026-08-14 14:23:45 +07:00 · 2026-08-14 14:22:45 +07:00
435 changed files with 4262 additions and 136 deletions
--- a/backups/conflicts/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb_conflict_1786685493.json
+++ b/backups/conflicts/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb_conflict_1786685493.json
@@ -0,0 +1,14 @@
+{
+  "id": "2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+<<<<<<< HEAD:identities/a7ca3944-af0e-498b-abd1-6af456468102.json
+    "password": "ENC:v1:U1RSTQEcyeKSsaxr0+1XqEGSRmnJ32HlR0U4xaMSotpS1fjCKAX0b/tEWHg="
+=======
+    "password": "ENC:v1:U1RSTQEShASLBCk+4IIGA2WHQ4Vc7EdrRYiusBHd352lU3Ap73PzGmZAunI="
+>>>>>>> FETCH_HEAD:identities/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb.json
+  },
+  "created_at": "2026-08-14T05:29:30.176231+00:00",
+  "updated_at": "2026-08-14T05:29:30.176231+00:00"
+}
--- a/backups/conflicts/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb_conflict_1786685614.json
+++ b/backups/conflicts/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb_conflict_1786685614.json
@@ -0,0 +1,14 @@
+{
+  "id": "2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+<<<<<<< HEAD:identities/a7ca3944-af0e-498b-abd1-6af456468102.json
+    "password": "ENC:v1:U1RSTQFn/70uE5Tpy2Vd5C4sJE8UBSEqrCXKVWrb73w22OZRLtbNNnsJs/E="
+=======
+    "password": "ENC:v1:U1RSTQEShASLBCk+4IIGA2WHQ4Vc7EdrRYiusBHd352lU3Ap73PzGmZAunI="
+>>>>>>> FETCH_HEAD:identities/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb.json
+  },
+  "created_at": "2026-08-14T05:29:30.176231+00:00",
+  "updated_at": "2026-08-14T05:29:30.176231+00:00"
+}
--- a/backups/conflicts/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb_conflict_1786685735.json
+++ b/backups/conflicts/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb_conflict_1786685735.json
@@ -0,0 +1,14 @@
+{
+  "id": "2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+<<<<<<< HEAD:identities/a7ca3944-af0e-498b-abd1-6af456468102.json
+    "password": "ENC:v1:U1RSTQH/iShG5ZPzh+4el2K3lHL96tx5r37DFrpGdCEP9Iw9AeTjGbjl4U0="
+=======
+    "password": "ENC:v1:U1RSTQEShASLBCk+4IIGA2WHQ4Vc7EdrRYiusBHd352lU3Ap73PzGmZAunI="
+>>>>>>> FETCH_HEAD:identities/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb.json
+  },
+  "created_at": "2026-08-14T05:29:30.176231+00:00",
+  "updated_at": "2026-08-14T05:29:30.176231+00:00"
+}
--- a/backups/conflicts/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb_conflict_1786685857.json
+++ b/backups/conflicts/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb_conflict_1786685857.json
@@ -0,0 +1,14 @@
+{
+  "id": "2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+<<<<<<< HEAD:identities/a7ca3944-af0e-498b-abd1-6af456468102.json
+    "password": "ENC:v1:U1RSTQHi2HjaMFvkT37wGVHDSLVSBJsjbX1bSFtpbV7nRB7FaFDa/LO87Kw="
+=======
+    "password": "ENC:v1:U1RSTQEShASLBCk+4IIGA2WHQ4Vc7EdrRYiusBHd352lU3Ap73PzGmZAunI="
+>>>>>>> FETCH_HEAD:identities/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb.json
+  },
+  "created_at": "2026-08-14T05:29:30.176231+00:00",
+  "updated_at": "2026-08-14T05:29:30.176231+00:00"
+}
--- a/backups/conflicts/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb_conflict_1786685978.json
+++ b/backups/conflicts/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb_conflict_1786685978.json
@@ -0,0 +1,14 @@
+{
+  "id": "2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+<<<<<<< HEAD:identities/a7ca3944-af0e-498b-abd1-6af456468102.json
+    "password": "ENC:v1:U1RSTQGXoqIZjJDGBOZHAQlOTA0tey+7GzHxpo/iqoS4Zrf8PrX5n2mVbhY="
+=======
+    "password": "ENC:v1:U1RSTQEShASLBCk+4IIGA2WHQ4Vc7EdrRYiusBHd352lU3Ap73PzGmZAunI="
+>>>>>>> FETCH_HEAD:identities/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb.json
+  },
+  "created_at": "2026-08-14T05:29:30.176231+00:00",
+  "updated_at": "2026-08-14T05:29:30.176231+00:00"
+}
--- a/backups/conflicts/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb_conflict_1786686099.json
+++ b/backups/conflicts/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb_conflict_1786686099.json
@@ -0,0 +1,14 @@
+{
+  "id": "2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+<<<<<<< HEAD:identities/a7ca3944-af0e-498b-abd1-6af456468102.json
+    "password": "ENC:v1:U1RSTQHoX8CTubuV9UZeR6HE23LlBaQvupSX+JwV1isWdm9KxSM7LCjGMKk="
+=======
+    "password": "ENC:v1:U1RSTQEShASLBCk+4IIGA2WHQ4Vc7EdrRYiusBHd352lU3Ap73PzGmZAunI="
+>>>>>>> FETCH_HEAD:identities/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb.json
+  },
+  "created_at": "2026-08-14T05:29:30.176231+00:00",
+  "updated_at": "2026-08-14T05:29:30.176231+00:00"
+}
--- a/backups/conflicts/529708d1-7e0e-47b9-bf42-5a15cbfdb145_conflict_1786685493.json
+++ b/backups/conflicts/529708d1-7e0e-47b9-bf42-5a15cbfdb145_conflict_1786685493.json
@@ -0,0 +1,17 @@
+{
+  "id": "529708d1-7e0e-47b9-bf42-5a15cbfdb145",
+  "name": "Docker Password Host",
+  "hostname": "127.0.0.1",
+  "port": 2222,
+  "username": "testuser",
+  "identity_id": "2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb",
+  "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:29:30.180223+00:00",
+  "updated_at": "2026-08-14T05:29:30.180223+00:00"
+}
--- a/backups/conflicts/529708d1-7e0e-47b9-bf42-5a15cbfdb145_conflict_1786685614.json
+++ b/backups/conflicts/529708d1-7e0e-47b9-bf42-5a15cbfdb145_conflict_1786685614.json
@@ -0,0 +1,17 @@
+{
+  "id": "529708d1-7e0e-47b9-bf42-5a15cbfdb145",
+  "name": "Docker Password Host",
+  "hostname": "127.0.0.1",
+  "port": 2222,
+  "username": "testuser",
+  "identity_id": "2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb",
+  "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:29:30.180223+00:00",
+  "updated_at": "2026-08-14T05:29:30.180223+00:00"
+}
--- a/backups/conflicts/529708d1-7e0e-47b9-bf42-5a15cbfdb145_conflict_1786685735.json
+++ b/backups/conflicts/529708d1-7e0e-47b9-bf42-5a15cbfdb145_conflict_1786685735.json
@@ -0,0 +1,17 @@
+{
+  "id": "529708d1-7e0e-47b9-bf42-5a15cbfdb145",
+  "name": "Docker Password Host",
+  "hostname": "127.0.0.1",
+  "port": 2222,
+  "username": "testuser",
+  "identity_id": "2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb",
+  "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:29:30.180223+00:00",
+  "updated_at": "2026-08-14T05:29:30.180223+00:00"
+}
--- a/backups/conflicts/529708d1-7e0e-47b9-bf42-5a15cbfdb145_conflict_1786685857.json
+++ b/backups/conflicts/529708d1-7e0e-47b9-bf42-5a15cbfdb145_conflict_1786685857.json
@@ -0,0 +1,17 @@
+{
+  "id": "529708d1-7e0e-47b9-bf42-5a15cbfdb145",
+  "name": "Docker Password Host",
+  "hostname": "127.0.0.1",
+  "port": 2222,
+  "username": "testuser",
+  "identity_id": "2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb",
+  "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:29:30.180223+00:00",
+  "updated_at": "2026-08-14T05:29:30.180223+00:00"
+}
--- a/backups/conflicts/529708d1-7e0e-47b9-bf42-5a15cbfdb145_conflict_1786685978.json
+++ b/backups/conflicts/529708d1-7e0e-47b9-bf42-5a15cbfdb145_conflict_1786685978.json
@@ -0,0 +1,17 @@
+{
+  "id": "529708d1-7e0e-47b9-bf42-5a15cbfdb145",
+  "name": "Docker Password Host",
+  "hostname": "127.0.0.1",
+  "port": 2222,
+  "username": "testuser",
+  "identity_id": "2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb",
+  "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:29:30.180223+00:00",
+  "updated_at": "2026-08-14T05:29:30.180223+00:00"
+}
--- a/backups/conflicts/529708d1-7e0e-47b9-bf42-5a15cbfdb145_conflict_1786686099.json
+++ b/backups/conflicts/529708d1-7e0e-47b9-bf42-5a15cbfdb145_conflict_1786686099.json
@@ -0,0 +1,17 @@
+{
+  "id": "529708d1-7e0e-47b9-bf42-5a15cbfdb145",
+  "name": "Docker Password Host",
+  "hostname": "127.0.0.1",
+  "port": 2222,
+  "username": "testuser",
+  "identity_id": "2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb",
+  "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:29:30.180223+00:00",
+  "updated_at": "2026-08-14T05:29:30.180223+00:00"
+}
--- a/backups/conflicts/77a6e3b5-ce22-4359-b0a8-66aabc7dd9c7_conflict_1786685065.json
+++ b/backups/conflicts/77a6e3b5-ce22-4359-b0a8-66aabc7dd9c7_conflict_1786685065.json
@@ -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"
+}
--- a/backups/conflicts/91d024bd-bdf7-4f24-84dd-c9cd37475058_conflict_1786685249.json
+++ b/backups/conflicts/91d024bd-bdf7-4f24-84dd-c9cd37475058_conflict_1786685249.json
@@ -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"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786685065.json
+++ 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"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786685126.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786685126.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"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786685188.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786685188.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"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786685249.json
+++ 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"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786685310.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786685310.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "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"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786685371.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786685371.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "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"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786685432.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786685432.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "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"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786685493.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786685493.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQEeotmMe5/SBVYgXsFyNxPNbrMNIvnYGmwKeh4zx3SjzhOYGCp+lvA="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786685554.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786685554.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQFn/70uE5Tpy2Vd5C4sJE8UBSEqrCXKVWrb73w22OZRLtbNNnsJs/E="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786685614.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786685614.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQFo22pgzHOlxQybNGS+Kn1B6lvDQMg1Gd4X0anDfyZ58Chz7NAkZ3o="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786685675.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786685675.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQH/iShG5ZPzh+4el2K3lHL96tx5r37DFrpGdCEP9Iw9AeTjGbjl4U0="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786685735.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786685735.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHTEK8VliH2l8UBFN94v8lrMsM1ohe2VL0bckdHUm5cPCzXiEvX12o="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786685796.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786685796.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHi2HjaMFvkT37wGVHDSLVSBJsjbX1bSFtpbV7nRB7FaFDa/LO87Kw="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786685857.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786685857.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQEJjqeNoBXcaej6besvdunuO4E6i0Z5/1GaJIwY9D3fFPIbC4uApVQ="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786685917.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786685917.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQGXoqIZjJDGBOZHAQlOTA0tey+7GzHxpo/iqoS4Zrf8PrX5n2mVbhY="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786685978.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786685978.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQGj3XaPChMDem8kig4sSC1L8V91kq4tYq37fnQqcZnocauf+Exbsh8="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786686039.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786686039.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHoX8CTubuV9UZeR6HE23LlBaQvupSX+JwV1isWdm9KxSM7LCjGMKk="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786686099.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786686099.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQGg4nQCSG1vKl2i1W8Q3m9m4USbkP+HmtQjpDYpLrtNTsxfj2Vv27A="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786686160.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786686160.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQEnAAYX3oN1vj9anMLGWj1rPmmD2wmr2Db28aXArkz9etjrIb3HcJ4="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786686221.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786686221.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQGbEtoVS4YrxC3NbBmhxe7RgPCPxj04coa2e80Qhi8cNeNHT4EnFr8="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786686281.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786686281.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQFYh2qbbKg6KjtJucQD5L+L4Vn1l5jSHwTsShybOOihJth9xfHmwDQ="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786686342.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786686342.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQGG9cTdRVEap10v0ckR63uN5s0iO79DvYjH5UGDPeqTDWfBqN96+1o="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786686402.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786686402.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQGkBLimjyZO3SISWOquBk+MyhMd3qLN8/Vn6H+Yj3x5hHJ2IXFMsOs="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786686463.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786686463.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQFYyHgmsoe9kuSYbZieirkaEwxd2zTtM2PH79UnDUx3P36Go2DUaM0="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786686524.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786686524.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786686585.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786686585.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786686645.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786686645.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786686706.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786686706.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786686767.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786686767.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786686827.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786686827.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786686888.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786686888.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786686948.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786686948.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786687009.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786687009.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786687069.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786687069.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786687130.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786687130.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786687191.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786687191.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786687251.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786687251.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786687312.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786687312.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786687372.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786687372.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786687433.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786687433.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786687493.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786687493.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786687554.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786687554.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786687615.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786687615.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786687675.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786687675.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786687736.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786687736.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786687796.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786687796.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786687857.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786687857.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786687917.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786687917.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786687978.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786687978.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786688039.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786688039.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786688099.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786688099.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786688160.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786688160.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786688220.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786688220.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786688281.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786688281.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786688342.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786688342.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786688402.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786688402.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786688463.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786688463.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786688524.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786688524.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786688584.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786688584.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786688645.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786688645.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786688705.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786688705.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786688766.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786688766.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786688826.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786688826.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786688887.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786688887.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786688947.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786688947.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786689008.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786689008.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786689069.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786689069.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786689129.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786689129.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786689190.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786689190.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786689250.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786689250.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786689311.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786689311.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786689371.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786689371.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786689432.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786689432.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786689492.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786689492.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786689553.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786689553.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786689614.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786689614.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786689675.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786689675.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786689735.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786689735.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786689796.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786689796.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786689857.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786689857.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786689918.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786689918.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786689979.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786689979.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786690040.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786690040.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786690101.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786690101.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786690162.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786690162.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786690222.json
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786690222.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
sTerm Sync	2ace6716ae	Merge branch (resolved)	2026-08-14 14:27:41 +07:00
sTerm Sync	79b54cea1e	Auto-sync: update local configurations	2026-08-14 14:26:47 +07:00
sTerm Sync	204b13b6ac	Auto-sync: update local configurations	2026-08-14 14:25:46 +07:00
sTerm Sync	a7a6e66452	Auto-sync: update local configurations	2026-08-14 14:24:46 +07:00
sTerm Sync	3245be5a0c	Auto-sync: update local configurations	2026-08-14 14:23:45 +07:00
sTerm Sync	a48e7afc3b	Auto-sync: update local configurations	2026-08-14 14:22:45 +07:00
sTerm Sync	d29158f54d	Auto-sync: update local configurations	2026-08-14 14:21:44 +07:00
sTerm Sync	753f56d33f	Auto-sync: update local configurations	2026-08-14 14:20:44 +07:00
sTerm Sync	cdf2631dba	Auto-sync: update local configurations	2026-08-14 14:19:43 +07:00
sTerm Sync	ae94105f44	Auto-sync: update local configurations	2026-08-14 14:18:42 +07:00
sTerm Sync	6b9124851d	Auto-sync: update local configurations	2026-08-14 14:17:42 +07:00
sTerm Sync	c6bc55e2ca	Auto-sync: update local configurations	2026-08-14 14:16:41 +07:00
sTerm Sync	86e0364d43	Auto-sync: update local configurations	2026-08-14 14:15:40 +07:00
sTerm Sync	32eaff7576	Auto-sync: update local configurations	2026-08-14 14:14:40 +07:00
sTerm Sync	47ff104113	Auto-sync: update local configurations	2026-08-14 14:13:39 +07:00
sTerm Sync	cecc375594	Auto-sync: update local configurations	2026-08-14 14:12:38 +07:00
sTerm Sync	77befbb1d2	Auto-sync: update local configurations	2026-08-14 14:11:38 +07:00
sTerm Sync	b54926c5b9	Auto-sync: update local configurations	2026-08-14 14:10:37 +07:00
sTerm Sync	f6a2589927	Auto-sync: update local configurations	2026-08-14 14:09:37 +07:00
sTerm Sync	0e3ca9c39a	Auto-sync: update local configurations	2026-08-14 14:08:36 +07:00
sTerm Sync	03bcc80f4b	Auto-sync: update local configurations	2026-08-14 14:07:35 +07:00
sTerm Sync	3a87f559e0	Auto-sync: update local configurations	2026-08-14 14:06:34 +07:00
sTerm Sync	d7fc7c38b6	Auto-sync: update local configurations	2026-08-14 14:05:34 +07:00
sTerm Sync	28ea1e3b76	Auto-sync: update local configurations	2026-08-14 14:04:33 +07:00
sTerm Sync	e427d69e1c	Auto-sync: update local configurations	2026-08-14 14:03:33 +07:00
sTerm Sync	ea3044d28c	Auto-sync: update local configurations	2026-08-14 14:02:32 +07:00
sTerm Sync	7e0eb45049	Auto-sync: update local configurations	2026-08-14 14:01:31 +07:00
sTerm Sync	c533af1fb7	Auto-sync: update local configurations	2026-08-14 14:00:30 +07:00
sTerm Sync	7e64dfcd78	Auto-sync: update local configurations	2026-08-14 13:59:30 +07:00
sTerm Sync	bc11284d26	Auto-sync: update local configurations	2026-08-14 13:58:29 +07:00
sTerm Sync	785f406879	Auto-sync: update local configurations	2026-08-14 13:57:28 +07:00
sTerm Sync	ac81430d93	Auto-sync: update local configurations	2026-08-14 13:56:27 +07:00
sTerm Sync	d713c5d237	Auto-sync: update local configurations	2026-08-14 13:55:26 +07:00
sTerm Sync	500ffeb75d	Auto-sync: update local configurations	2026-08-14 13:54:25 +07:00
sTerm Sync	faf9386726	Auto-sync: update local configurations	2026-08-14 13:53:24 +07:00
sTerm Sync	55632102d7	Auto-sync: update local configurations	2026-08-14 13:52:24 +07:00
sTerm Sync	d2cab846cb	Auto-sync: update local configurations	2026-08-14 13:51:23 +07:00
sTerm Sync	c85ee19ed0	Auto-sync: update local configurations	2026-08-14 13:50:22 +07:00
sTerm Sync	930030dd56	Auto-sync: update local configurations	2026-08-14 13:49:21 +07:00
sTerm Sync	2bd086e77e	Auto-sync: update local configurations	2026-08-14 13:48:20 +07:00
sTerm Sync	bf4c899c94	Auto-sync: update local configurations	2026-08-14 13:47:20 +07:00
sTerm Sync	c3d8fc933d	Auto-sync: update local configurations	2026-08-14 13:46:19 +07:00
sTerm Sync	00b0177705	Auto-sync: update local configurations	2026-08-14 13:45:18 +07:00
sTerm Sync	85a92b1134	Auto-sync: update local configurations	2026-08-14 13:44:17 +07:00
sTerm Sync	4203d1f0b8	Auto-sync: update local configurations	2026-08-14 13:43:16 +07:00
sTerm Sync	ce130b1c6d	Auto-sync: update local configurations	2026-08-14 13:42:15 +07:00
sTerm Sync	ead616f5c5	Auto-sync: update local configurations	2026-08-14 13:41:14 +07:00
sTerm Sync	964e71aacb	Auto-sync: update local configurations	2026-08-14 13:40:13 +07:00
sTerm Sync	5ac6ff804f	Auto-sync: update local configurations	2026-08-14 13:39:12 +07:00
sTerm Sync	ecda373b8d	Auto-sync: update local configurations	2026-08-14 13:38:12 +07:00
sTerm Sync	c9111e34ad	Auto-sync: update local configurations	2026-08-14 13:37:11 +07:00
sTerm Sync	423f9e1393	Auto-sync: update local configurations	2026-08-14 13:36:11 +07:00
sTerm Sync	39077553e0	Auto-sync: update local configurations	2026-08-14 13:35:10 +07:00
sTerm Sync	ef688fd020	Auto-sync: update local configurations	2026-08-14 13:34:10 +07:00
sTerm Sync	a9fbfe3ec0	Auto-sync: update local configurations	2026-08-14 13:33:09 +07:00
sTerm Sync	bd144d59d3	Auto-sync: update local configurations	2026-08-14 13:32:09 +07:00
sTerm Sync	0b7783a455	Auto-sync: update local configurations	2026-08-14 13:31:08 +07:00
sTerm Sync	158763429a	Auto-sync: update local configurations	2026-08-14 13:30:07 +07:00
sTerm Sync	19f7f4e617	Auto-sync: update local configurations	2026-08-14 13:29:07 +07:00
sTerm Sync	c3771d5205	Auto-sync: update local configurations	2026-08-14 13:28:06 +07:00
sTerm Sync	d6f4954714	Auto-sync: update local configurations	2026-08-14 13:27:06 +07:00
sTerm Sync	34754f33e0	Auto-sync: update local configurations	2026-08-14 13:26:05 +07:00
sTerm Sync	d43f3e06a0	Auto-sync: update local configurations	2026-08-14 13:25:05 +07:00
sTerm Sync	e4c4d53902	Auto-sync: update local configurations	2026-08-14 13:24:04 +07:00
sTerm Sync	be5dfc21ac	Auto-sync: update local configurations	2026-08-14 13:23:04 +07:00
sTerm Sync	24e9db356e	Auto-sync: update local configurations	2026-08-14 13:22:03 +07:00
sTerm Sync	737d84bc15	Auto-sync: update local configurations	2026-08-14 13:21:03 +07:00
sTerm Sync	bad4c6adf3	Auto-sync: update local configurations	2026-08-14 13:20:02 +07:00
sTerm Sync	d55972b58f	Auto-sync: update local configurations	2026-08-14 13:19:01 +07:00
sTerm Sync	8bf2b20eb1	Auto-sync: update local configurations	2026-08-14 13:18:01 +07:00
sTerm Sync	ea02f8f8d1	Auto-sync: update local configurations	2026-08-14 13:17:00 +07:00
sTerm Sync	eb3320e7fb	Auto-sync: update local configurations	2026-08-14 13:15:59 +07:00
sTerm Sync	993878a0e6	Auto-sync: update local configurations	2026-08-14 13:14:59 +07:00
sTerm Sync	9bb33c51fd	Auto-sync: update local configurations	2026-08-14 13:13:58 +07:00
sTerm Sync	93e88bcfc6	Auto-sync: update local configurations	2026-08-14 13:12:58 +07:00
sTerm Sync	76c068db6c	Auto-sync: update local configurations	2026-08-14 13:11:57 +07:00
sTerm Sync	b76b2bdefb	Auto-sync: update local configurations	2026-08-14 13:10:57 +07:00
sTerm Sync	e38d725a5b	Auto-sync: update local configurations	2026-08-14 13:09:56 +07:00
sTerm Sync	793785f25f	Auto-sync: update local configurations	2026-08-14 13:08:55 +07:00
sTerm Sync	1ea1bba2dc	Auto-sync: update local configurations	2026-08-14 13:07:55 +07:00
sTerm Sync	2cf0664c0c	Auto-sync: update local configurations	2026-08-14 13:06:54 +07:00
sTerm Sync	224c2db6a5	Auto-sync: update local configurations	2026-08-14 13:05:54 +07:00
sTerm Sync	2b6d3f76ff	Auto-sync: update local configurations	2026-08-14 13:04:53 +07:00
sTerm Sync	61c00261da	Auto-sync: update local configurations	2026-08-14 13:03:52 +07:00
sTerm Sync	af08b3d13f	Auto-sync: update local configurations	2026-08-14 13:02:52 +07:00
sTerm Sync	5f00c3c9ff	Auto-sync: update local configurations	2026-08-14 13:01:51 +07:00
sTerm Sync	880e2bfedd	Auto-sync: update local configurations	2026-08-14 13:00:51 +07:00
sTerm Sync	9df315dfd2	Auto-sync: update local configurations	2026-08-14 12:59:50 +07:00
sTerm Sync	220562338d	Auto-sync: update local configurations	2026-08-14 12:58:49 +07:00
sTerm Sync	307704f7a2	Auto-sync: update local configurations	2026-08-14 12:57:49 +07:00
sTerm Sync	dc16d2551f	Auto-sync: update local configurations	2026-08-14 12:56:48 +07:00
sTerm Sync	56ae351fd0	Auto-sync: update local configurations	2026-08-14 12:55:48 +07:00
sTerm Sync	1e65111560	Auto-sync: update local configurations	2026-08-14 12:54:47 +07:00
sTerm Sync	5e5015246c	Auto-sync: update local configurations	2026-08-14 12:53:47 +07:00
sTerm Sync	f1edb5572d	Auto-sync: update local configurations	2026-08-14 12:52:46 +07:00
sTerm Sync	f297ec01d4	Auto-sync: update local configurations	2026-08-14 12:51:45 +07:00
sTerm Sync	ccfdcc4114	Auto-sync: update local configurations	2026-08-14 12:50:45 +07:00
sTerm Sync	9b243fa4c7	Auto-sync: update local configurations	2026-08-14 12:49:44 +07:00
sTerm Sync	32fd9bc9e1	Auto-sync: update local configurations	2026-08-14 12:48:43 +07:00
sTerm Sync	0e0429b3ac	Auto-sync: update local configurations	2026-08-14 12:47:43 +07:00
sTerm Sync	63239df8d6	Auto-sync: update local configurations	2026-08-14 12:46:42 +07:00
sTerm Sync	a4dd345978	Auto-sync: update local configurations	2026-08-14 12:45:41 +07:00
sTerm Sync	f5387e1e88	Auto-sync: update local configurations	2026-08-14 12:44:41 +07:00
sTerm Sync	356113ce38	Auto-sync: update local configurations	2026-08-14 12:43:40 +07:00
sTerm Sync	95ca65357c	Auto-sync: update local configurations	2026-08-14 12:42:39 +07:00
sTerm Sync	17561b8f46	Auto-sync: update local configurations	2026-08-14 12:41:39 +07:00
sTerm Sync	42271000a9	Auto-sync: update local configurations	2026-08-14 12:40:38 +07:00
sTerm Sync	1f9a76f05b	Auto-sync: update local configurations	2026-08-14 12:39:37 +07:00
sTerm Sync	30c177b48d	Auto-sync: update local configurations	2026-08-14 12:38:37 +07:00
sTerm Sync	4c4a22c16a	Auto-sync: update local configurations	2026-08-14 12:37:36 +07:00
sTerm Sync	1fc630d796	Auto-sync: update local configurations	2026-08-14 12:36:36 +07:00
sTerm Sync	f5ae65cc4b	Auto-sync: update local configurations	2026-08-14 12:35:35 +07:00
sTerm Sync	53fb36cacc	Auto-sync: update local configurations	2026-08-14 12:34:34 +07:00
sTerm Sync	226c5f7cc7	Auto-sync: update local configurations	2026-08-14 12:33:34 +07:00
sTerm Sync	fd96cedf8c	Auto-sync: update local configurations	2026-08-14 12:32:33 +07:00
sTerm Sync	5cc34713c3	Auto-sync: update local configurations	2026-08-14 12:31:33 +07:00
sTerm Sync	cc02489778	Auto-sync: update local configurations	2026-08-14 12:30:32 +07:00
sTerm Sync	2e6a31d635	Auto-sync: update local configurations	2026-08-14 12:29:30 +07:00
sTerm Sync	b14e30f972	Auto-sync: update local configurations	2026-08-14 12:28:29 +07:00
sTerm Sync	c5449dba99	Auto-sync: update local configurations	2026-08-14 12:27:28 +07:00
sTerm Sync	38db2ce81a	Auto-sync: update local configurations	2026-08-14 12:26:27 +07:00
sTerm Sync	50bf6e0190	Auto-sync: update local configurations	2026-08-14 12:25:25 +07:00
sTerm Sync	5bbf150d5c	Auto-sync: update local configurations	2026-08-14 12:24:25 +07:00
sTerm Sync	9514140a39	Auto-sync: update local configurations	2026-08-14 12:24:21 +07:00
sTerm Sync	a891014b6b	Auto-sync: update local configurations	2026-08-14 12:23:21 +07:00
sTerm Sync	e68da3efe1	Auto-sync: update local configurations	2026-08-14 12:22:19 +07:00