diff --git a/sub/base64.txt b/sub/base64.txt
index 90a818031..c970077b3 100644
--- a/sub/base64.txt
+++ b/sub/base64.txt
@@ -1 +1 @@
-c3NyOi8vZFhNdFlXMHpMbVZ4Ym05a1pTNXVaWFE2T0RBNE1UcHZjbWxuYVc0NllXVnpMVEkxTmkxalptSTZkR3h6TVM0eVgzUnBZMnRsZEY5aGRYUm9PbHB0T1RGUFJURkRVakpzY1M4L2IySm1jM0JoY21GdFBTWndjbTkwYjNCaGNtRnRQU1p5WlcxaGNtdHpQWE56Y2w5dFpYUmhYekV4Sm5CeWIzUnZjR0Z5WVcwOUptOWlabk53WVhKaGJUMD0Kc3NyOi8vYzJwbmVYTjVMbU5rYmk1dWIyUmxMbUV1ZEdSa2JuTXRiM1Z1YXk1amIyMDZNVE0wTkRrNllYVjBhRjloWlhNeE1qaGZiV1ExT25Kak5DMXRaRFU2ZEd4ek1TNHlYM1JwWTJ0bGRGOWhkWFJvT2xFelRuSmtlbHByTHo5dlltWnpjR0Z5WVcwOUpuQnliM1J2Y0dGeVlXMDlUbFJKTUU5VVZUVlBhbFl4VGtVeFlVNW5QVDBtY21WdFlYSnJjejF6YzNKZmJXVjBZVjh4TVNad2NtOTBiM0JoY21GdFRsUkpNRTlVVlRWUGFsWXhUa1V4WVU1blBUMDlKbTlpWm5Od1lYSmhiVDA9CmFIUjBjSE02THk5a2IyNW5kR0ZwZDJGdVp5NWpiMjA2Wkc5dVozUmhhWGRoYm1jdVkyOXRRRzVoYVhabE1qQXVZMlpqWkc0ekxuaDVlam8wTkRNPQphSFIwY0hNNkx5OWtiMjVuZEdGcGQyRnVaeTVqYjIwNlpHOXVaM1JoYVhkaGJtY3VZMjl0UUc1aGFYWmxNakF1WTJaalpHNHpMbmg1ZWpvME5ETT0KaHlzdGVyaWE6Ly85MS4xNDkuMjM5LjIzOjExMjIzP3BlZXI9YmluZy5jb20mYXV0aD1kb25ndGFpd2FuZy5jb20maW5zZWN1cmU9MSZ1cG1icHM9MTEmZG93bm1icHM9NTUmYWxwbj1oMyZvYmZzPWRvbmd0YWl3YW5nLmNvbSZwcm90b2NvbD11ZHAmZmFzdG9wZW49MSNVbml0ZWQgU3RhdGVzX2h5c3RlcmlhXzAKaHlzdGVyaWE6Ly8xNjYuMS4yMjEuMTY5OjExMjIzP3BlZXI9YmluZy5jb20mYXV0aD1kb25ndGFpd2FuZy5jb20maW5zZWN1cmU9MSZ1cG1icHM9MTEmZG93bm1icHM9NTUmYWxwbj1oMyZvYmZzPWRvbmd0YWl3YW5nLmNvbSZwcm90b2NvbD11ZHAmZmFzdG9wZW49MSNVbml0ZWQgU3RhdGVzX2h5c3RlcmlhXzEKaHlzdGVyaWE6Ly8xNjYuMS4yMjEuMTY5OjExMjIzP3BlZXI9YmluZy5jb20mYXV0aD1kb25ndGFpd2FuZy5jb20maW5zZWN1cmU9MSZ1cG1icHM9MTEmZG93bm1icHM9NTUmYWxwbj1oMyZvYmZzPWRvbmd0YWl3YW5nLmNvbSZwcm90b2NvbD11ZHAmZmFzdG9wZW49MSNVbml0ZWQgU3RhdGVzX2h5c3RlcmlhXzIKaHlzdGVyaWE6Ly8xNjYuMS4yMjEuMTY5OjExMjIzP3BlZXI9YmluZy5jb20mYXV0aD1kb25ndGFpd2FuZy5jb20maW5zZWN1cmU9MSZ1cG1icHM9MTEmZG93bm1icHM9NTUmYWxwbj1oMyZvYmZzPWRvbmd0YWl3YW5nLmNvbSZwcm90b2NvbD11ZHAmZmFzdG9wZW49MSNVbml0ZWQgU3RhdGVzX2h5c3RlcmlhXzMKaHlzdGVyaWEyOi8vZG9uZ3RhaXdhbmcuY29tQDIwNy45MC4yMzkuMTU3OjM0MDAsMjAwMDAtMzAwMDA/aW5zZWN1cmU9MSZzbmk9d3d3LmJpbmcuY29tI1VuaXRlZCBTdGF0ZXNfaHlzdGVyaWEyXzAKaHlzdGVyaWEyOi8vZG9uZ3RhaXdhbmcuY29tQDIwNy45MC4yMzkuMTU3OjM0MDAsMjAwMDAtMzAwMDA/aW5zZWN1cmU9MSZzbmk9d3d3LmJpbmcuY29tI1VuaXRlZCBTdGF0ZXNfaHlzdGVyaWEyXzEKaHlzdGVyaWEyOi8vZG9uZ3RhaXdhbmcuY29tQDIwNy45MC4yMzkuMTU3OjM0MDAsMjAwMDAtMzAwMDA/aW5zZWN1cmU9MSZzbmk9d3d3LmJpbmcuY29tI1VuaXRlZCBTdGF0ZXNfaHlzdGVyaWEyXzIKaHlzdGVyaWEyOi8vZG9uZ3RhaXdhbmcuY29tQDIwNy45MC4yMzkuMTU3OjM0MDAsMjAwMDAtMzAwMDA/aW5zZWN1cmU9MSZzbmk9d3d3LmJpbmcuY29tI1VuaXRlZCBTdGF0ZXNfaHlzdGVyaWEyXzM=
\ No newline at end of file
+c3NyOi8vYzJwbmVYTjVMbU5rYmk1dWIyUmxMbUV1ZEdSa2JuTXRiM1Z1YXk1amIyMDZNVE0wTkRrNllYVjBhRjloWlhNeE1qaGZiV1ExT25Kak5DMXRaRFU2ZEd4ek1TNHlYM1JwWTJ0bGRGOWhkWFJvT2xFelRuSmtlbHByTHo5dlltWnpjR0Z5WVcwOUpuQnliM1J2Y0dGeVlXMDlUbFJKTUU5VVZUVlBhbFl4VGtVeFlVNW5QVDBtY21WdFlYSnJjejF6YzNKZmJXVjBZVjh4TVNad2NtOTBiM0JoY21GdFRsUkpNRTlVVlRWUGFsWXhUa1V4WVU1blBUMDlKbTlpWm5Od1lYSmhiVDA9CnNzcjovL2RYTXRZVzB6TG1WeGJtOWtaUzV1WlhRNk9EQTRNVHB2Y21sbmFXNDZZV1Z6TFRJMU5pMWpabUk2ZEd4ek1TNHlYM1JwWTJ0bGRGOWhkWFJvT2xwdE9URlBSVEZEVWpKc2NTOC9iMkptYzNCaGNtRnRQU1p3Y205MGIzQmhjbUZ0UFNaeVpXMWhjbXR6UFhOemNsOXRaWFJoWHpFeEpuQnliM1J2Y0dGeVlXMDlKbTlpWm5Od1lYSmhiVDA9CmFIUjBjSE02THk5a2IyNW5kR0ZwZDJGdVp5NWpiMjA2Wkc5dVozUmhhWGRoYm1jdVkyOXRRRzVoYVhabE1qQXVZMlpqWkc0ekxuaDVlam8wTkRNPQphSFIwY0hNNkx5OWtiMjVuZEdGcGQyRnVaeTVqYjIwNlpHOXVaM1JoYVhkaGJtY3VZMjl0UUc1aGFYWmxNakF1WTJaalpHNHpMbmg1ZWpvME5ETT0KaHlzdGVyaWE6Ly85MS4xNDkuMjM5LjIzOjExMjIzP3BlZXI9YmluZy5jb20mYXV0aD1kb25ndGFpd2FuZy5jb20maW5zZWN1cmU9MSZ1cG1icHM9MTEmZG93bm1icHM9NTUmYWxwbj1oMyZvYmZzPWRvbmd0YWl3YW5nLmNvbSZwcm90b2NvbD11ZHAmZmFzdG9wZW49MSNVbml0ZWQgU3RhdGVzX2h5c3RlcmlhXzAKaHlzdGVyaWE6Ly8xNjYuMS4yMjEuMTY5OjExMjIzP3BlZXI9YmluZy5jb20mYXV0aD1kb25ndGFpd2FuZy5jb20maW5zZWN1cmU9MSZ1cG1icHM9MTEmZG93bm1icHM9NTUmYWxwbj1oMyZvYmZzPWRvbmd0YWl3YW5nLmNvbSZwcm90b2NvbD11ZHAmZmFzdG9wZW49MSNVbml0ZWQgU3RhdGVzX2h5c3RlcmlhXzEKaHlzdGVyaWE6Ly8xNjYuMS4yMjEuMTY5OjExMjIzP3BlZXI9YmluZy5jb20mYXV0aD1kb25ndGFpd2FuZy5jb20maW5zZWN1cmU9MSZ1cG1icHM9MTEmZG93bm1icHM9NTUmYWxwbj1oMyZvYmZzPWRvbmd0YWl3YW5nLmNvbSZwcm90b2NvbD11ZHAmZmFzdG9wZW49MSNVbml0ZWQgU3RhdGVzX2h5c3RlcmlhXzIKaHlzdGVyaWE6Ly8xNjYuMS4yMjEuMTY5OjExMjIzP3BlZXI9YmluZy5jb20mYXV0aD1kb25ndGFpd2FuZy5jb20maW5zZWN1cmU9MSZ1cG1icHM9MTEmZG93bm1icHM9NTUmYWxwbj1oMyZvYmZzPWRvbmd0YWl3YW5nLmNvbSZwcm90b2NvbD11ZHAmZmFzdG9wZW49MSNVbml0ZWQgU3RhdGVzX2h5c3RlcmlhXzMKaHlzdGVyaWEyOi8vZG9uZ3RhaXdhbmcuY29tQDIwNy45MC4yMzkuMTU3OjM0MDAsMjAwMDAtMzAwMDA/aW5zZWN1cmU9MSZzbmk9d3d3LmJpbmcuY29tI1VuaXRlZCBTdGF0ZXNfaHlzdGVyaWEyXzAKaHlzdGVyaWEyOi8vZG9uZ3RhaXdhbmcuY29tQDIwNy45MC4yMzkuMTU3OjM0MDAsMjAwMDAtMzAwMDA/aW5zZWN1cmU9MSZzbmk9d3d3LmJpbmcuY29tI1VuaXRlZCBTdGF0ZXNfaHlzdGVyaWEyXzEKaHlzdGVyaWEyOi8vZG9uZ3RhaXdhbmcuY29tQDIwNy45MC4yMzkuMTU3OjM0MDAsMjAwMDAtMzAwMDA/aW5zZWN1cmU9MSZzbmk9d3d3LmJpbmcuY29tI1VuaXRlZCBTdGF0ZXNfaHlzdGVyaWEyXzIKaHlzdGVyaWEyOi8vZG9uZ3RhaXdhbmcuY29tQDIwNy45MC4yMzkuMTU3OjM0MDAsMjAwMDAtMzAwMDA/aW5zZWN1cmU9MSZzbmk9d3d3LmJpbmcuY29tI1VuaXRlZCBTdGF0ZXNfaHlzdGVyaWEyXzM=
\ No newline at end of file
diff --git a/sub/merged_proxies_new.yaml b/sub/merged_proxies_new.yaml
index 2c095df42..0e12772b9 100644
--- a/sub/merged_proxies_new.yaml
+++ b/sub/merged_proxies_new.yaml
@@ -1480,7 +1480,7 @@ proxies:
     path: github.com/Alvin9999
     headers:
       Host: ip1.1789034.xyz
-- name: None_None_vmess_098
+- name: United States_None_vmess_098
   type: vmess
   server: russia.com
   port: 2086
@@ -1510,7 +1510,7 @@ proxies:
     path: github.com/Alvin9999
     headers:
       Host: ip1.1789034.xyz
-- name: United States_None_vmess_0100
+- name: None_None_vmess_0100
   type: vmess
   server: skk.moe
   port: 2086
@@ -2980,7 +2980,7 @@ proxies:
     path: github.com/Alvin9999
     headers:
       Host: ip1.1789034.xyz
-- name: None_None_vmess_197
+- name: United States_None_vmess_197
   type: vmess
   server: malaysia.com
   port: 2086
@@ -2995,7 +2995,7 @@ proxies:
     path: github.com/Alvin9999
     headers:
       Host: ip1.1789034.xyz
-- name: None_None_vmess_198
+- name: United States_None_vmess_198
   type: vmess
   server: russia.com
   port: 2086
@@ -3010,7 +3010,7 @@ proxies:
     path: github.com/Alvin9999
     headers:
       Host: ip1.1789034.xyz
-- name: None_None_vmess_199
+- name: United States_None_vmess_199
   type: vmess
   server: singapore.com
   port: 2086
@@ -4645,7 +4645,7 @@ proxies:
     path: github.com/Alvin9999
     headers:
       Host: ip1.1789034.xyz
-- name: None_None_vmess_595
+- name: United States_None_vmess_595
   type: vmess
   server: ip.sb
   port: 2086
@@ -4660,7 +4660,7 @@ proxies:
     path: github.com/Alvin9999
     headers:
       Host: ip1.1789034.xyz
-- name: United States_None_vmess_596
+- name: None_None_vmess_596
   type: vmess
   server: japan.com
   port: 2086
@@ -4690,7 +4690,7 @@ proxies:
     path: github.com/Alvin9999
     headers:
       Host: ip1.1789034.xyz
-- name: None_None_vmess_598
+- name: United States_None_vmess_598
   type: vmess
   server: russia.com
   port: 2086
@@ -4705,7 +4705,7 @@ proxies:
     path: github.com/Alvin9999
     headers:
       Host: ip1.1789034.xyz
-- name: United States_None_vmess_599
+- name: None_None_vmess_599
   type: vmess
   server: singapore.com
   port: 2086
@@ -4720,7 +4720,7 @@ proxies:
     path: github.com/Alvin9999
     headers:
       Host: ip1.1789034.xyz
-- name: None_None_vmess_5100
+- name: United States_None_vmess_5100
   type: vmess
   server: skk.moe
   port: 2086
@@ -6265,7 +6265,7 @@ proxies:
     path: github.com/Alvin9999
     headers:
       Host: ip1.1789034.xyz
-- name: None_None_vmess_798
+- name: United States_None_vmess_798
   type: vmess
   server: russia.com
   port: 2086
@@ -6280,7 +6280,7 @@ proxies:
     path: github.com/Alvin9999
     headers:
       Host: ip1.1789034.xyz
-- name: None_None_vmess_799
+- name: United States_None_vmess_799
   type: vmess
   server: singapore.com
   port: 2086
@@ -7750,7 +7750,7 @@ proxies:
     path: github.com/Alvin9999
     headers:
       Host: ip1.1789034.xyz
-- name: United States_None_vmess_896
+- name: None_None_vmess_896
   type: vmess
   server: japan.com
   port: 2086
@@ -7765,7 +7765,7 @@ proxies:
     path: github.com/Alvin9999
     headers:
       Host: ip1.1789034.xyz
-- name: United States_None_vmess_897
+- name: None_None_vmess_897
   type: vmess
   server: malaysia.com
   port: 2086
@@ -8091,9 +8091,9 @@ proxy-groups:
   - United States_None_vmess_095
   - None_None_vmess_096
   - None_None_vmess_097
-  - None_None_vmess_098
+  - United States_None_vmess_098
   - United States_None_vmess_099
-  - United States_None_vmess_0100
+  - None_None_vmess_0100
   - None_None_vmess_0101
   - None_None_vmess_11
   - None_None_vmess_12
@@ -8191,9 +8191,9 @@ proxy-groups:
   - None_None_vmess_194
   - United States_None_vmess_195
   - None_None_vmess_196
-  - None_None_vmess_197
-  - None_None_vmess_198
-  - None_None_vmess_199
+  - United States_None_vmess_197
+  - United States_None_vmess_198
+  - United States_None_vmess_199
   - United States_None_vmess_1100
   - None_None_vmess_1101
   - None_None_vmess_21
@@ -8302,12 +8302,12 @@ proxy-groups:
   - None_None_vmess_592
   - Canada_Ottawa_vmess_593
   - United States_None_vmess_594
-  - None_None_vmess_595
-  - United States_None_vmess_596
+  - United States_None_vmess_595
+  - None_None_vmess_596
   - None_None_vmess_597
-  - None_None_vmess_598
-  - United States_None_vmess_599
-  - None_None_vmess_5100
+  - United States_None_vmess_598
+  - None_None_vmess_599
+  - United States_None_vmess_5100
   - None_None_vmess_5101
   - None_None_vmess_61
   - Canada_Ottawa_vmess_62
@@ -8410,8 +8410,8 @@ proxy-groups:
   - None_None_vmess_795
   - None_None_vmess_796
   - None_None_vmess_797
-  - None_None_vmess_798
-  - None_None_vmess_799
+  - United States_None_vmess_798
+  - United States_None_vmess_799
   - United States_None_vmess_7100
   - None_None_vmess_7101
   - None_None_vmess_81
@@ -8509,8 +8509,8 @@ proxy-groups:
   - Canada_Ottawa_vmess_893
   - United States_None_vmess_894
   - None_None_vmess_895
-  - United States_None_vmess_896
-  - United States_None_vmess_897
+  - None_None_vmess_896
+  - None_None_vmess_897
   - None_None_vmess_898
   - None_None_vmess_899
   - None_None_vmess_8100
@@ -8630,9 +8630,9 @@ proxy-groups:
   - United States_None_vmess_095
   - None_None_vmess_096
   - None_None_vmess_097
-  - None_None_vmess_098
+  - United States_None_vmess_098
   - United States_None_vmess_099
-  - United States_None_vmess_0100
+  - None_None_vmess_0100
   - None_None_vmess_0101
   - None_None_vmess_11
   - None_None_vmess_12
@@ -8730,9 +8730,9 @@ proxy-groups:
   - None_None_vmess_194
   - United States_None_vmess_195
   - None_None_vmess_196
-  - None_None_vmess_197
-  - None_None_vmess_198
-  - None_None_vmess_199
+  - United States_None_vmess_197
+  - United States_None_vmess_198
+  - United States_None_vmess_199
   - United States_None_vmess_1100
   - None_None_vmess_1101
   - None_None_vmess_21
@@ -8841,12 +8841,12 @@ proxy-groups:
   - None_None_vmess_592
   - Canada_Ottawa_vmess_593
   - United States_None_vmess_594
-  - None_None_vmess_595
-  - United States_None_vmess_596
+  - United States_None_vmess_595
+  - None_None_vmess_596
   - None_None_vmess_597
-  - None_None_vmess_598
-  - United States_None_vmess_599
-  - None_None_vmess_5100
+  - United States_None_vmess_598
+  - None_None_vmess_599
+  - United States_None_vmess_5100
   - None_None_vmess_5101
   - None_None_vmess_61
   - Canada_Ottawa_vmess_62
@@ -8949,8 +8949,8 @@ proxy-groups:
   - None_None_vmess_795
   - None_None_vmess_796
   - None_None_vmess_797
-  - None_None_vmess_798
-  - None_None_vmess_799
+  - United States_None_vmess_798
+  - United States_None_vmess_799
   - United States_None_vmess_7100
   - None_None_vmess_7101
   - None_None_vmess_81
@@ -9048,8 +9048,8 @@ proxy-groups:
   - Canada_Ottawa_vmess_893
   - United States_None_vmess_894
   - None_None_vmess_895
-  - United States_None_vmess_896
-  - United States_None_vmess_897
+  - None_None_vmess_896
+  - None_None_vmess_897
   - None_None_vmess_898
   - None_None_vmess_899
   - None_None_vmess_8100