Update

Shadowrocket/Complete.conf

@@ -17336,18 +17336,16 @@ IP-CIDR,223.255.0.0/17,DIRECT,no-resolve
 IP-CIDR,223.255.236.0/22,DIRECT,no-resolve
 IP-CIDR,223.255.252.0/23,DIRECT,no-resolve
 
-# > CN
 DOMAIN-SUFFIX,cn,DIRECT
 
+IP-CIDR,10.0.0.0/8,DIRECT,no-resolve
+IP-CIDR,100.64.0.0/10,DIRECT,no-resolve
+IP-CIDR,127.0.0.0/8,DIRECT,no-resolve
+IP-CIDR,172.16.0.0/12,DIRECT,no-resolve
+IP-CIDR,192.168.0.0/16,DIRECT,no-resolve
+
 
 
-<<<<<<< HEAD
-IP-CIDR,10.0.0.0/8,DIRECT
-IP-CIDR,100.64.0.0/10,DIRECT
-IP-CIDR,127.0.0.0/8,DIRECT
-IP-CIDR,172.16.0.0/12,DIRECT
-IP-CIDR,192.168.0.0/16,DIRECT
-=======
 # > Apple API
 DOMAIN-SUFFIX,aaplimg.com,PROXY
 DOMAIN-SUFFIX,Proxy.co,PROXY
@@ -17374,8 +17372,6 @@ IP-CIDR,205.180.175.0/24,PROXY,no-resolve
 DOMAIN-SUFFIX,Proxy.news,PROXY
 
 # > Apple CDN
-PROCESS-NAME,storedownloadd,DIRECT
-USER-AGENT,com.apple.appstored*,DIRECT
 DOMAIN,aod.itunes.apple.com,DIRECT
 DOMAIN,api.smoot.apple.cn,DIRECT
 DOMAIN,appldnld.apple.com,DIRECT
@@ -17391,15 +17387,11 @@ DOMAIN,updates-http.cdn-apple.com,DIRECT
 DOMAIN-SUFFIX,ls.apple.com,DIRECT
 DOMAIN-SUFFIX,mzstatic.com,DIRECT
 
-
-
-
 IP-CIDR,10.0.0.0/8,DIRECT,no-resolve
 IP-CIDR,100.64.0.0/10,DIRECT,no-resolve
 IP-CIDR,127.0.0.0/8,DIRECT,no-resolve
 IP-CIDR,172.16.0.0/12,DIRECT,no-resolve
 IP-CIDR,192.168.0.0/16,DIRECT,no-resolve
->>>>>>> parent of 020eb9c... del: no-resolve
 
 GEOIP,CN,DIRECT
 FINAL,PROXY

Surfboard/Rule.conf

@@ -17321,18 +17321,16 @@ IP-CIDR,223.255.0.0/17,DIRECT,no-resolve
 IP-CIDR,223.255.236.0/22,DIRECT,no-resolve
 IP-CIDR,223.255.252.0/23,DIRECT,no-resolve
 
-# > CN
 DOMAIN-SUFFIX,cn,DIRECT
 
+IP-CIDR,10.0.0.0/8,DIRECT,no-resolve
+IP-CIDR,100.64.0.0/10,DIRECT,no-resolve
+IP-CIDR,127.0.0.0/8,DIRECT,no-resolve
+IP-CIDR,172.16.0.0/12,DIRECT,no-resolve
+IP-CIDR,192.168.0.0/16,DIRECT,no-resolve
+
 
 
-<<<<<<< HEAD
-IP-CIDR,10.0.0.0/8,DIRECT
-IP-CIDR,100.64.0.0/10,DIRECT
-IP-CIDR,127.0.0.0/8,DIRECT
-IP-CIDR,172.16.0.0/12,DIRECT
-IP-CIDR,192.168.0.0/16,DIRECT
-=======
 # > Apple API
 DOMAIN-SUFFIX,aaplimg.com,Proxy
 DOMAIN-SUFFIX,Proxy.co,Proxy
@@ -17359,8 +17357,6 @@ IP-CIDR,205.180.175.0/24,Proxy,no-resolve
 DOMAIN-SUFFIX,Proxy.news,Proxy
 
 # > Apple CDN
-# PROCESS-NAME,storedownloadd,DIRECT
-# USER-AGENT,com.apple.appstored*,DIRECT
 DOMAIN,aod.itunes.apple.com,DIRECT
 DOMAIN,api.smoot.apple.cn,DIRECT
 DOMAIN,appldnld.apple.com,DIRECT
@@ -17376,15 +17372,11 @@ DOMAIN,updates-http.cdn-apple.com,DIRECT
 DOMAIN-SUFFIX,ls.apple.com,DIRECT
 DOMAIN-SUFFIX,mzstatic.com,DIRECT
 
-
-
-
 IP-CIDR,10.0.0.0/8,DIRECT,no-resolve
 IP-CIDR,100.64.0.0/10,DIRECT,no-resolve
 IP-CIDR,127.0.0.0/8,DIRECT,no-resolve
 IP-CIDR,172.16.0.0/12,DIRECT,no-resolve
 IP-CIDR,192.168.0.0/16,DIRECT,no-resolve
->>>>>>> parent of 020eb9c... del: no-resolve
 
 GEOIP,CN,DIRECT
 FINAL,Proxy

Surge/Surge 2/Rule.conf

@@ -17368,13 +17368,14 @@ IP-CIDR,223.255.0.0/17,Domestic,no-resolve
 IP-CIDR,223.255.236.0/22,Domestic,no-resolve
 IP-CIDR,223.255.252.0/23,Domestic,no-resolve
 
-# > CN
 DOMAIN-SUFFIX,cn,Domestic
 
+IP-CIDR,10.0.0.0/8,DIRECT,no-resolve
+IP-CIDR,100.64.0.0/10,DIRECT,no-resolve
+IP-CIDR,127.0.0.0/8,DIRECT,no-resolve
+IP-CIDR,172.16.0.0/12,DIRECT,no-resolve
+IP-CIDR,192.168.0.0/16,DIRECT,no-resolve
 
-
-<<<<<<< HEAD
-=======
 # > Apple API
 DOMAIN-SUFFIX,aaplimg.com,Apple
 DOMAIN-SUFFIX,apple.co,Apple
@@ -17404,8 +17405,6 @@ DOMAIN-SUFFIX,apple.news,Apple
 PROCESS-NAME,com.apple.geod,Apple
 
 # > Apple CDN
-PROCESS-NAME,storedownloadd,DIRECT
-USER-AGENT,com.apple.appstored*,DIRECT
 DOMAIN,aod.itunes.apple.com,DIRECT
 DOMAIN,api.smoot.apple.cn,DIRECT
 DOMAIN,appldnld.apple.com,DIRECT
@@ -17421,15 +17420,5 @@ DOMAIN,updates-http.cdn-apple.com,DIRECT
 DOMAIN-SUFFIX,ls.apple.com,DIRECT
 DOMAIN-SUFFIX,mzstatic.com,DIRECT
 
-
-
->>>>>>> parent of 020eb9c... del: no-resolve
-
-IP-CIDR,10.0.0.0/8,DIRECT,no-resolve
-IP-CIDR,100.64.0.0/10,DIRECT,no-resolve
-IP-CIDR,127.0.0.0/8,DIRECT,no-resolve
-IP-CIDR,172.16.0.0/12,DIRECT,no-resolve
-IP-CIDR,192.168.0.0/16,DIRECT,no-resolve
-
 GEOIP,CN,Domestic
 FINAL,Others,dns-failed