diff --git a/sub/merged_proxies_new.yaml b/sub/merged_proxies_new.yaml
index 469bdc18c0..150421bf5b 100644
--- a/sub/merged_proxies_new.yaml
+++ b/sub/merged_proxies_new.yaml
@@ -145,7 +145,7 @@ proxies:
     path: 55021a7c-bd6c-418e-be95-ceac8ba27b45-vm
     headers:
       host: widescreen-instruction-breakdown-postage.trycloudflare.com
-- name: United States_None_vmess_09
+- name: None_None_vmess_09
   type: vmess
   server: yh1.dtku41.xyz
   port: 8080
@@ -160,7 +160,7 @@ proxies:
     path: 34c0bb5e-c120-432d-9c58-bd7d82c7397b-vm
     headers:
       host: uh-lawyers-instruments-kernel.trycloudflare.com
-- name: None_None_vmess_010
+- name: United States_None_vmess_010
   type: vmess
   server: yh1.dtku41.xyz
   port: 8080
@@ -190,7 +190,7 @@ proxies:
     path: 9258153a-dc97-4e39-9037-009abfc4fed0-vm
     headers:
       host: per-essex-patterns-bowling.trycloudflare.com
-- name: United States_None_vmess_012
+- name: None_None_vmess_012
   type: vmess
   server: yh1.dtku41.xyz
   port: 8080
@@ -220,7 +220,7 @@ proxies:
     path: 34c0bb5e-c120-432d-9c58-bd7d82c7397b-vm
     headers:
       host: uh-lawyers-instruments-kernel.trycloudflare.com
-- name: None_None_vmess_014
+- name: United States_None_vmess_014
   type: vmess
   server: yh2.dtku41.xyz
   port: 8080
@@ -337,7 +337,7 @@ proxies:
   reduce-rtt: true
   udp-relay-mode: native
   congestion-controller: bbr
-- name: United States_None_vmess_31
+- name: None_None_vmess_31
   type: vmess
   server: yh1.freeh1.xyz
   port: 8080
@@ -352,7 +352,7 @@ proxies:
     path: 34c0bb5e-c120-432d-9c58-bd7d82c7397b-vm
     headers:
       host: uh-lawyers-instruments-kernel.trycloudflare.com
-- name: United States_None_vmess_32
+- name: None_None_vmess_32
   type: vmess
   server: yh1.freeh1.xyz
   port: 8080
@@ -367,7 +367,7 @@ proxies:
     path: 9258153a-dc97-4e39-9037-009abfc4fed0-vm
     headers:
       host: per-essex-patterns-bowling.trycloudflare.com
-- name: United States_None_vmess_33
+- name: None_None_vmess_33
   type: vmess
   server: yh1.freeh1.xyz
   port: 8080
@@ -382,7 +382,7 @@ proxies:
     path: 9b196b50-37f2-4f4b-b175-06273adc6207-vm
     headers:
       host: championship-bidding-oxygen-brochure.trycloudflare.com
-- name: None_None_vmess_34
+- name: United States_None_vmess_34
   type: vmess
   server: yh1.freeh1.xyz
   port: 8080
@@ -532,7 +532,7 @@ proxies:
     path: ef8c954e-014f-4b36-8273-9b5086afab34-vm
     headers:
       host: bibliographic-sword-sequence-advertisers.trycloudflare.com
-- name: United States_None_vmess_56
+- name: None_None_vmess_56
   type: vmess
   server: yh1.freeh1.xyz
   port: 8080
@@ -607,7 +607,7 @@ proxies:
     path: 028c8131-9e3e-4836-94ac-ea7f24d4d05a-vm
     headers:
       host: nest-emily-healing-h.trycloudflare.com
-- name: None_None_vmess_511
+- name: United States_None_vmess_511
   type: vmess
   server: yh2.freeh1.xyz
   port: 8080
@@ -622,7 +622,7 @@ proxies:
     path: d9c5ec6a-a8d8-4732-8447-56fbd2f93e96-vm
     headers:
       host: pcs-referenced-camera-concerns.trycloudflare.com
-- name: United States_San Francisco_vmess_512
+- name: United States_None_vmess_512
   type: vmess
   server: yh3.freeh1.xyz
   port: 8080
@@ -652,7 +652,7 @@ proxies:
     path: ef8c954e-014f-4b36-8273-9b5086afab34-vm
     headers:
       host: bibliographic-sword-sequence-advertisers.trycloudflare.com
-- name: United States_San Francisco_vmess_514
+- name: None_None_vmess_514
   type: vmess
   server: yh3.freeh1.xyz
   port: 8080
@@ -667,7 +667,7 @@ proxies:
     path: 028c8131-9e3e-4836-94ac-ea7f24d4d05a-vm
     headers:
       host: nest-emily-healing-h.trycloudflare.com
-- name: None_None_vmess_515
+- name: United States_San Francisco_vmess_515
   type: vmess
   server: yh3.freeh1.xyz
   port: 8080
@@ -844,12 +844,12 @@ proxy-groups:
   - None_None_vmess_06
   - None_None_vmess_07
   - None_None_vmess_08
-  - United States_None_vmess_09
-  - None_None_vmess_010
+  - None_None_vmess_09
+  - United States_None_vmess_010
   - None_None_vmess_011
-  - United States_None_vmess_012
+  - None_None_vmess_012
   - None_None_vmess_013
-  - None_None_vmess_014
+  - United States_None_vmess_014
   - None_None_vmess_015
   - None_None_vmess_016
   - None_None_vmess_11
@@ -857,10 +857,10 @@ proxy-groups:
   - None_None_vmess_13
   - None_None_vmess_14
   - United States_Los Angeles_tuic_21
-  - United States_None_vmess_31
-  - United States_None_vmess_32
-  - United States_None_vmess_33
-  - None_None_vmess_34
+  - None_None_vmess_31
+  - None_None_vmess_32
+  - None_None_vmess_33
+  - United States_None_vmess_34
   - Canada_Ottawa_vmess_41
   - Canada_Ottawa_vmess_42
   - Canada_Ottawa_vmess_43
@@ -870,16 +870,16 @@ proxy-groups:
   - None_None_vmess_53
   - None_None_vmess_54
   - None_None_vmess_55
-  - United States_None_vmess_56
+  - None_None_vmess_56
   - None_None_vmess_57
   - None_None_vmess_58
   - None_None_vmess_59
   - None_None_vmess_510
-  - None_None_vmess_511
-  - United States_San Francisco_vmess_512
+  - United States_None_vmess_511
+  - United States_None_vmess_512
   - None_None_vmess_513
-  - United States_San Francisco_vmess_514
-  - None_None_vmess_515
+  - None_None_vmess_514
+  - United States_San Francisco_vmess_515
   - None_None_vmess_516
   - Taiwan_Taipei_hysteria_61
   - France_Paris_hysteria2_71
@@ -907,12 +907,12 @@ proxy-groups:
   - None_None_vmess_06
   - None_None_vmess_07
   - None_None_vmess_08
-  - United States_None_vmess_09
-  - None_None_vmess_010
+  - None_None_vmess_09
+  - United States_None_vmess_010
   - None_None_vmess_011
-  - United States_None_vmess_012
+  - None_None_vmess_012
   - None_None_vmess_013
-  - None_None_vmess_014
+  - United States_None_vmess_014
   - None_None_vmess_015
   - None_None_vmess_016
   - None_None_vmess_11
@@ -920,10 +920,10 @@ proxy-groups:
   - None_None_vmess_13
   - None_None_vmess_14
   - United States_Los Angeles_tuic_21
-  - United States_None_vmess_31
-  - United States_None_vmess_32
-  - United States_None_vmess_33
-  - None_None_vmess_34
+  - None_None_vmess_31
+  - None_None_vmess_32
+  - None_None_vmess_33
+  - United States_None_vmess_34
   - Canada_Ottawa_vmess_41
   - Canada_Ottawa_vmess_42
   - Canada_Ottawa_vmess_43
@@ -933,16 +933,16 @@ proxy-groups:
   - None_None_vmess_53
   - None_None_vmess_54
   - None_None_vmess_55
-  - United States_None_vmess_56
+  - None_None_vmess_56
   - None_None_vmess_57
   - None_None_vmess_58
   - None_None_vmess_59
   - None_None_vmess_510
-  - None_None_vmess_511
-  - United States_San Francisco_vmess_512
+  - United States_None_vmess_511
+  - United States_None_vmess_512
   - None_None_vmess_513
-  - United States_San Francisco_vmess_514
-  - None_None_vmess_515
+  - None_None_vmess_514
+  - United States_San Francisco_vmess_515
   - None_None_vmess_516
   - Taiwan_Taipei_hysteria_61
   - France_Paris_hysteria2_71
diff --git a/sub/merged_warp_proxies_new.yaml b/sub/merged_warp_proxies_new.yaml
index 9208ecb080..0e80cb0e9a 100644
--- a/sub/merged_warp_proxies_new.yaml
+++ b/sub/merged_warp_proxies_new.yaml
@@ -164,7 +164,7 @@ proxies:
     path: 55021a7c-bd6c-418e-be95-ceac8ba27b45-vm
     headers:
       host: widescreen-instruction-breakdown-postage.trycloudflare.com
-- name: United States_None_vmess_09
+- name: None_None_vmess_09
   type: vmess
   server: yh1.dtku41.xyz
   port: 8080
@@ -179,7 +179,7 @@ proxies:
     path: 34c0bb5e-c120-432d-9c58-bd7d82c7397b-vm
     headers:
       host: uh-lawyers-instruments-kernel.trycloudflare.com
-- name: None_None_vmess_010
+- name: United States_None_vmess_010
   type: vmess
   server: yh1.dtku41.xyz
   port: 8080
@@ -209,7 +209,7 @@ proxies:
     path: 9258153a-dc97-4e39-9037-009abfc4fed0-vm
     headers:
       host: per-essex-patterns-bowling.trycloudflare.com
-- name: United States_None_vmess_012
+- name: None_None_vmess_012
   type: vmess
   server: yh1.dtku41.xyz
   port: 8080
@@ -239,7 +239,7 @@ proxies:
     path: 34c0bb5e-c120-432d-9c58-bd7d82c7397b-vm
     headers:
       host: uh-lawyers-instruments-kernel.trycloudflare.com
-- name: None_None_vmess_014
+- name: United States_None_vmess_014
   type: vmess
   server: yh2.dtku41.xyz
   port: 8080
@@ -356,7 +356,7 @@ proxies:
   reduce-rtt: true
   udp-relay-mode: native
   congestion-controller: bbr
-- name: United States_None_vmess_31
+- name: None_None_vmess_31
   type: vmess
   server: yh1.freeh1.xyz
   port: 8080
@@ -371,7 +371,7 @@ proxies:
     path: 34c0bb5e-c120-432d-9c58-bd7d82c7397b-vm
     headers:
       host: uh-lawyers-instruments-kernel.trycloudflare.com
-- name: United States_None_vmess_32
+- name: None_None_vmess_32
   type: vmess
   server: yh1.freeh1.xyz
   port: 8080
@@ -386,7 +386,7 @@ proxies:
     path: 9258153a-dc97-4e39-9037-009abfc4fed0-vm
     headers:
       host: per-essex-patterns-bowling.trycloudflare.com
-- name: United States_None_vmess_33
+- name: None_None_vmess_33
   type: vmess
   server: yh1.freeh1.xyz
   port: 8080
@@ -401,7 +401,7 @@ proxies:
     path: 9b196b50-37f2-4f4b-b175-06273adc6207-vm
     headers:
       host: championship-bidding-oxygen-brochure.trycloudflare.com
-- name: None_None_vmess_34
+- name: United States_None_vmess_34
   type: vmess
   server: yh1.freeh1.xyz
   port: 8080
@@ -551,7 +551,7 @@ proxies:
     path: ef8c954e-014f-4b36-8273-9b5086afab34-vm
     headers:
       host: bibliographic-sword-sequence-advertisers.trycloudflare.com
-- name: United States_None_vmess_56
+- name: None_None_vmess_56
   type: vmess
   server: yh1.freeh1.xyz
   port: 8080
@@ -626,7 +626,7 @@ proxies:
     path: 028c8131-9e3e-4836-94ac-ea7f24d4d05a-vm
     headers:
       host: nest-emily-healing-h.trycloudflare.com
-- name: None_None_vmess_511
+- name: United States_None_vmess_511
   type: vmess
   server: yh2.freeh1.xyz
   port: 8080
@@ -641,7 +641,7 @@ proxies:
     path: d9c5ec6a-a8d8-4732-8447-56fbd2f93e96-vm
     headers:
       host: pcs-referenced-camera-concerns.trycloudflare.com
-- name: United States_San Francisco_vmess_512
+- name: United States_None_vmess_512
   type: vmess
   server: yh3.freeh1.xyz
   port: 8080
@@ -671,7 +671,7 @@ proxies:
     path: ef8c954e-014f-4b36-8273-9b5086afab34-vm
     headers:
       host: bibliographic-sword-sequence-advertisers.trycloudflare.com
-- name: United States_San Francisco_vmess_514
+- name: None_None_vmess_514
   type: vmess
   server: yh3.freeh1.xyz
   port: 8080
@@ -686,7 +686,7 @@ proxies:
     path: 028c8131-9e3e-4836-94ac-ea7f24d4d05a-vm
     headers:
       host: nest-emily-healing-h.trycloudflare.com
-- name: None_None_vmess_515
+- name: United States_San Francisco_vmess_515
   type: vmess
   server: yh3.freeh1.xyz
   port: 8080
@@ -878,12 +878,12 @@ proxy-groups:
   - None_None_vmess_06
   - None_None_vmess_07
   - None_None_vmess_08
-  - United States_None_vmess_09
-  - None_None_vmess_010
+  - None_None_vmess_09
+  - United States_None_vmess_010
   - None_None_vmess_011
-  - United States_None_vmess_012
+  - None_None_vmess_012
   - None_None_vmess_013
-  - None_None_vmess_014
+  - United States_None_vmess_014
   - None_None_vmess_015
   - None_None_vmess_016
   - None_None_vmess_11
@@ -891,10 +891,10 @@ proxy-groups:
   - None_None_vmess_13
   - None_None_vmess_14
   - United States_Los Angeles_tuic_21
-  - United States_None_vmess_31
-  - United States_None_vmess_32
-  - United States_None_vmess_33
-  - None_None_vmess_34
+  - None_None_vmess_31
+  - None_None_vmess_32
+  - None_None_vmess_33
+  - United States_None_vmess_34
   - Canada_Ottawa_vmess_41
   - Canada_Ottawa_vmess_42
   - Canada_Ottawa_vmess_43
@@ -904,16 +904,16 @@ proxy-groups:
   - None_None_vmess_53
   - None_None_vmess_54
   - None_None_vmess_55
-  - United States_None_vmess_56
+  - None_None_vmess_56
   - None_None_vmess_57
   - None_None_vmess_58
   - None_None_vmess_59
   - None_None_vmess_510
-  - None_None_vmess_511
-  - United States_San Francisco_vmess_512
+  - United States_None_vmess_511
+  - United States_None_vmess_512
   - None_None_vmess_513
-  - United States_San Francisco_vmess_514
-  - None_None_vmess_515
+  - None_None_vmess_514
+  - United States_San Francisco_vmess_515
   - None_None_vmess_516
   - Taiwan_Taipei_hysteria_61
   - France_Paris_hysteria2_71
@@ -938,12 +938,12 @@ proxy-groups:
   - None_None_vmess_06
   - None_None_vmess_07
   - None_None_vmess_08
-  - United States_None_vmess_09
-  - None_None_vmess_010
+  - None_None_vmess_09
+  - United States_None_vmess_010
   - None_None_vmess_011
-  - United States_None_vmess_012
+  - None_None_vmess_012
   - None_None_vmess_013
-  - None_None_vmess_014
+  - United States_None_vmess_014
   - None_None_vmess_015
   - None_None_vmess_016
   - None_None_vmess_11
@@ -951,10 +951,10 @@ proxy-groups:
   - None_None_vmess_13
   - None_None_vmess_14
   - United States_Los Angeles_tuic_21
-  - United States_None_vmess_31
-  - United States_None_vmess_32
-  - United States_None_vmess_33
-  - None_None_vmess_34
+  - None_None_vmess_31
+  - None_None_vmess_32
+  - None_None_vmess_33
+  - United States_None_vmess_34
   - Canada_Ottawa_vmess_41
   - Canada_Ottawa_vmess_42
   - Canada_Ottawa_vmess_43
@@ -964,16 +964,16 @@ proxy-groups:
   - None_None_vmess_53
   - None_None_vmess_54
   - None_None_vmess_55
-  - United States_None_vmess_56
+  - None_None_vmess_56
   - None_None_vmess_57
   - None_None_vmess_58
   - None_None_vmess_59
   - None_None_vmess_510
-  - None_None_vmess_511
-  - United States_San Francisco_vmess_512
+  - United States_None_vmess_511
+  - United States_None_vmess_512
   - None_None_vmess_513
-  - United States_San Francisco_vmess_514
-  - None_None_vmess_515
+  - None_None_vmess_514
+  - United States_San Francisco_vmess_515
   - None_None_vmess_516
   - Taiwan_Taipei_hysteria_61
   - France_Paris_hysteria2_71
@@ -998,12 +998,12 @@ proxy-groups:
   - None_None_vmess_06
   - None_None_vmess_07
   - None_None_vmess_08
-  - United States_None_vmess_09
-  - None_None_vmess_010
+  - None_None_vmess_09
+  - United States_None_vmess_010
   - None_None_vmess_011
-  - United States_None_vmess_012
+  - None_None_vmess_012
   - None_None_vmess_013
-  - None_None_vmess_014
+  - United States_None_vmess_014
   - None_None_vmess_015
   - None_None_vmess_016
   - None_None_vmess_11
@@ -1011,10 +1011,10 @@ proxy-groups:
   - None_None_vmess_13
   - None_None_vmess_14
   - United States_Los Angeles_tuic_21
-  - United States_None_vmess_31
-  - United States_None_vmess_32
-  - United States_None_vmess_33
-  - None_None_vmess_34
+  - None_None_vmess_31
+  - None_None_vmess_32
+  - None_None_vmess_33
+  - United States_None_vmess_34
   - Canada_Ottawa_vmess_41
   - Canada_Ottawa_vmess_42
   - Canada_Ottawa_vmess_43
@@ -1024,16 +1024,16 @@ proxy-groups:
   - None_None_vmess_53
   - None_None_vmess_54
   - None_None_vmess_55
-  - United States_None_vmess_56
+  - None_None_vmess_56
   - None_None_vmess_57
   - None_None_vmess_58
   - None_None_vmess_59
   - None_None_vmess_510
-  - None_None_vmess_511
-  - United States_San Francisco_vmess_512
+  - United States_None_vmess_511
+  - United States_None_vmess_512
   - None_None_vmess_513
-  - United States_San Francisco_vmess_514
-  - None_None_vmess_515
+  - None_None_vmess_514
+  - United States_San Francisco_vmess_515
   - None_None_vmess_516
   - Taiwan_Taipei_hysteria_61
   - France_Paris_hysteria2_71