diff --git a/MirrorListV4 b/MirrorListV4
index d7f9976..03d459e 100644
--- a/MirrorListV4
+++ b/MirrorListV4
@@ -62,25 +62,16 @@
 147.229.176.19/32
 89.102.0.150/32
 195.113.250.60/32
-<<<<<<< Updated upstream
 194.71.11.165/32
 194.71.11.173/32
 194.71.11.173/32
-=======
-194.71.11.173/32
-194.71.11.165/32
-194.71.11.173/32
->>>>>>> Stashed changes
 194.71.11.165/32
 130.225.254.116/32
 77.247.64.34/32
-194.71.11.173/32
-<<<<<<< Updated upstream
-=======
-194.71.11.165/32
->>>>>>> Stashed changes
 194.71.11.165/32
 194.71.11.173/32
+194.71.11.173/32
+194.71.11.165/32
 195.140.195.56/32
 89.190.6.70/32
 193.166.3.3/32
@@ -124,8 +115,8 @@
 137.226.34.46/32
 80.237.136.138/32
 129.143.116.10/32
-212.201.68.61/32
 212.201.68.60/32
+212.201.68.61/32
 134.109.228.1/32
 130.75.2.22/32
 131.246.123.4/32
@@ -150,11 +141,6 @@
 78.129.164.123/32
 78.129.164.123/32
 85.94.199.210/32
-203.178.137.175/32
-<<<<<<< Updated upstream
-=======
-153.127.75.11/32
->>>>>>> Stashed changes
 85.94.199.210/32
 109.73.80.190/32
 151.0.128.28/32
@@ -168,8 +154,8 @@
 158.129.159.169/32
 83.171.27.40/32
 130.89.149.21/32
-103.2.187.6/32
 103.2.187.5/32
+103.2.187.6/32
 163.7.134.112/32
 130.89.149.21/32
 130.89.149.21/32
@@ -210,18 +196,13 @@
 213.129.232.18/32
 213.129.232.18/32
 151.101.194.132/32
-151.101.2.132/32
-<<<<<<< Updated upstream
 151.101.66.132/32
-151.101.130.132/32
-=======
+151.101.2.132/32
 151.101.130.132/32
 151.101.66.132/32
->>>>>>> Stashed changes
-151.101.2.132/32
 151.101.194.132/32
 151.101.130.132/32
-151.101.66.132/32
+151.101.2.132/32
 80.64.47.13/32
 193.145.15.20/32
 95.20.11.14/32
@@ -232,53 +213,29 @@
 193.146.75.19/32
 155.210.4.97/32
 82.194.78.250/32
-<<<<<<< Updated upstream
-194.71.11.173/32
-194.71.11.165/32
-194.71.11.165/32
-194.71.11.173/32
-130.235.34.30/32
-194.71.11.165/32
-194.71.11.173/32
-=======
 194.71.11.165/32
 194.71.11.173/32
 194.71.11.165/32
 194.71.11.173/32
 130.235.34.30/32
-194.71.11.173/32
 194.71.11.165/32
->>>>>>> Stashed changes
+194.71.11.173/32
 194.132.225.213/32
 94.103.202.216/32
 109.74.12.226/32
 129.132.89.152/32
-<<<<<<< Updated upstream
 140.110.240.80/32
 129.132.89.152/32
 129.132.89.152/32
 95.143.57.162/32
-137.138.54.24/32
+188.185.41.214/32
+137.138.55.108/32
 188.185.40.58/32
-188.185.41.214/32
-188.184.65.236/32
-188.184.79.9/32
 137.138.121.171/32
-137.138.55.108/32
-188.185.48.60/32
-=======
-129.132.89.152/32
-129.132.89.152/32
-95.143.57.162/32
-188.184.79.9/32
-137.138.55.108/32
-188.185.41.214/32
-137.138.121.171/32
-188.185.48.60/32
 188.184.65.236/32
 137.138.54.24/32
-188.185.40.58/32
->>>>>>> Stashed changes
+188.185.48.60/32
+188.184.79.9/32
 83.166.143.42/32
 83.166.143.43/32
 109.202.202.202/32
@@ -302,25 +259,15 @@
 85.13.241.50/32
 212.219.56.184/32
 143.20.69.35/32
-<<<<<<< Updated upstream
-81.91.100.176/32
-81.91.100.175/32
-5.180.211.190/32
-208.80.154.139/32
-64.50.233.100/32
-64.50.236.52/32
-208.80.154.139/32
-=======
 81.91.100.175/32
 81.91.100.176/32
 5.180.211.190/32
 208.80.154.139/32
 64.50.236.52/32
 64.50.233.100/32
-208.80.154.139/32
->>>>>>> Stashed changes
-64.50.233.100/32
 64.50.236.52/32
+64.50.233.100/32
+208.80.154.139/32
 92.119.16.152/32
 20.61.228.89/32
 128.180.2.105/32
@@ -369,39 +316,21 @@
 176.124.104.176/32
 185.100.87.86/32
 164.73.233.2/32
-<<<<<<< Updated upstream
-151.101.66.132/32
 151.101.194.132/32
 151.101.2.132/32
 151.101.130.132/32
-=======
-151.101.130.132/32
 151.101.66.132/32
-151.101.194.132/32
-151.101.2.132/32
->>>>>>> Stashed changes
-13.32.121.35/32
-13.32.121.29/32
-13.32.121.78/32
-13.32.121.111/32
-<<<<<<< Updated upstream
-185.219.221.167/32
+3.164.240.105/32
+3.164.240.119/32
+3.164.240.73/32
+3.164.240.123/32
 45.84.67.184/32
-185.199.109.153/32
-185.199.108.153/32
-185.199.110.153/32
-185.199.111.153/32
-185.199.108.153/32
-185.199.109.153/32
-=======
 45.84.67.184/32
-212.224.123.70/32
-185.199.110.153/32
 185.199.108.153/32
->>>>>>> Stashed changes
-185.199.111.153/32
-185.199.109.153/32
 185.199.109.153/32
 185.199.110.153/32
 185.199.111.153/32
+185.199.109.153/32
+185.199.111.153/32
+185.199.110.153/32
 185.199.108.153/32
diff --git a/MirrorListV6 b/MirrorListV6
index 486cece..4fc6ee5 100644
--- a/MirrorListV6
+++ b/MirrorListV6
@@ -27,8 +27,8 @@
 2a02:7900:1:3::deb/128
 2001:67c:20d0:f::11/128
 2a00:1728:20::5/128
-2a01:8740:ffff:fffc::32/128
 2a01:8740:ffff:fffc::31/128
+2a01:8740:ffff:fffc::32/128
 2604:1500:f001:0:216:3eff:fe3f:746b/128
 2604:1500:f001:0:216:3eff:fe3f:746b/128
 2604:1500:f001:0:216:3eff:fe3f:746b/128
@@ -49,19 +49,16 @@
 2001:67c:1220:8b0::93e5:b013/128
 2a02:8301:0:2::150/128
 2001:718:1007:48::1:60/128
-<<<<<<< Updated upstream
-=======
-2001:6b0:19::165/128
->>>>>>> Stashed changes
 2001:6b0:19::173/128
 2001:6b0:19::165/128
 2001:6b0:19::173/128
+2001:6b0:19::165/128
 2001:878:346::116/128
 2a02:4de0:21::2/128
-2001:6b0:19::173/128
 2001:6b0:19::165/128
 2001:6b0:19::173/128
 2001:6b0:19::165/128
+2001:6b0:19::173/128
 2001:67c:2b0:19:201:aeff:fe64:6562/128
 2001:67c:ecc:25::70/128
 2001:708:10:8::3/128
@@ -76,8 +73,8 @@
 2001:660:2402::6/128
 2a0c:1100:100:0:1:c2d6:dac1:0/128
 2a0c:3d00:abac:101:5:180:57:34/128
-2a00:c70:1:80:93:84:15:1/128
 2a00:c70:1:80:93:84:15:2/128
+2a00:c70:1:80:93:84:15:1/128
 2001:910:0:40::159/128
 2a02:cbf7:100::400/128
 2a00:8a60:e012:a00::21/128
@@ -96,13 +93,13 @@
 2a00:8a60:e012:a00::21/128
 2a01:488:10:1::50ed:888a/128
 2001:7c0:700::10/128
-2a00:5ba0:8000:e:92e2:baff:fe36:3e88/128
 2a00:5ba0:8000:e:92e2:baff:fe36:3cd0/128
+2a00:5ba0:8000:e:92e2:baff:fe36:3e88/128
 2001:638:911:b0e:134:109:228:1/128
 2001:638:208:ef1b:0:ff:fe00:4/128
 2001:4c80:40:628:215:5dff:fe01:be02/128
-2001:7c0:2041:48::42/128
 2001:7c0:2041:48::41/128
+2001:7c0:2041:48::42/128
 2003:d1:3012::400/128
 2a00:f48:1007:32::30/128
 2a07:6fc0:1:0:73::59/128
@@ -122,7 +119,7 @@
 2001:4b78:2000:1::1/128
 2001:4b78:2000:1::1/128
 2a00:1cc8:0:ff0a::2/128
-2001:760:ffff:bf::aa/128
+2001:760:ffff:bf::ab/128
 2001:4b78:2000:1::1/128
 2001:760:2e03::ca:26:0/128
 2001:67c:2564:a120::21/128
@@ -160,73 +157,40 @@
 2a02:130:9900:30::12/128
 2001:858:2:1::10/128
 2001:858:2:1::10/128
-<<<<<<< Updated upstream
-2a04:4e42:600::644/128
-2a04:4e42:200::644/128
-2a04:4e42::644/128
-2a04:4e42:400::644/128
-2a04:4e42:200::644/128
-2a04:4e42:400::644/128
-2a04:4e42:600::644/128
-2a04:4e42::644/128
-=======
-2a04:4e42:400::644/128
-2a04:4e42:600::644/128
-2a04:4e42:200::644/128
-2a04:4e42::644/128
-2a04:4e42::644/128
 2a04:4e42:200::644/128
 2a04:4e42:600::644/128
 2a04:4e42:400::644/128
->>>>>>> Stashed changes
+2a04:4e42::644/128
+2a04:4e42:200::644/128
+2a04:4e42::644/128
+2a04:4e42:400::644/128
+2a04:4e42:600::644/128
 2001:720:424:1::1:20/128
 2001:470:c8b6:0:10:1:2:4/128
 2a00:9ac0:c1ca:5::134/128
 2a12:d282:102:f6::1/128
 2001:720:1c14::ffff:c192:4b13/128
-<<<<<<< Updated upstream
 2001:6b0:19::173/128
 2001:6b0:19::165/128
 2001:6b0:19::173/128
 2001:6b0:19::165/128
 2001:6b0:19::173/128
 2001:6b0:19::165/128
-=======
-2001:6b0:19::165/128
-2001:6b0:19::173/128
-2001:6b0:19::165/128
-2001:6b0:19::173/128
-2001:6b0:19::173/128
-2001:6b0:19::165/128
->>>>>>> Stashed changes
 2a01:8e01:c1ea:6c5c::5/128
 2a01:8e01:c1ea:6c5c::8/128
 2a02:750:9::e8/128
 2001:67c:10ec:3dc2::28/128
-<<<<<<< Updated upstream
 2001:e10:2000:240:e643:4bff:fee8:a63c/128
 2001:67c:10ec:3dc2::28/128
 2001:67c:10ec:3dc2::28/128
+2001:1458:d00:17::100:c5/128
+2001:1458:201:a4::100:2dc/128
 2001:1458:d00:17::100:24e/128
-2001:1458:d00:24::100:356/128
 2001:1458:d00:6f::100:42e/128
-2001:1458:d00:16::100:427/128
 2001:1458:d00:24::100:635/128
 2001:1458:d00:61::100:3d6/128
-2001:1458:201:a4::100:2dc/128
-2001:1458:d00:17::100:c5/128
-=======
-2001:67c:10ec:3dc2::28/128
-2001:67c:10ec:3dc2::28/128
-2001:1458:d00:17::100:c5/128
-2001:1458:d00:16::100:427/128
-2001:1458:d00:17::100:24e/128
 2001:1458:d00:24::100:356/128
-2001:1458:d00:24::100:635/128
-2001:1458:d00:6f::100:42e/128
-2001:1458:201:a4::100:2dc/128
-2001:1458:d00:61::100:3d6/128
->>>>>>> Stashed changes
+2001:1458:d00:16::100:427/128
 2001:1600:0:aaaa::2:2/128
 2001:1600:0:aaaa::2:1/128
 2001:1620::1620/128
@@ -239,32 +203,21 @@
 2a01:550:0:402::2:1/128
 2001:1b40:5600:ff80:f8ee::1/128
 2a01:70:1:211:2::73/128
-2a00:1098:1::5/128
 2a00:1098:0:86:1000::25/128
+2a00:1098:1::5/128
 2a01:c0:2:3d::2/128
 2001:630:341:12::184/128
 2a0f:85c1:c3b:2010::35/128
 2a0d:5082:0:7::2/128
+2600:3404:200:237::2/128
+2600:3402:200:227::2/128
 2620:0:861:2:208:80:154:139/128
 2600:3404:200:237::2/128
 2600:3402:200:227::2/128
-2600:3402:200:227::2/128
-2620:0:861:2:208:80:154:139/128
-2600:3404:200:237::2/128
-<<<<<<< Updated upstream
-2600:3402:200:227::2/128
-2620:0:861:2:208:80:154:139/128
-2600:3404:200:237::2/128
-2a10:4dc0:2:5::2/128
-2603:1020:203:3::a/128
-2001:19f0:1595:1403::1092/128
-2600:3402:200:227::2/128
-=======
 2620:0:861:2:208:80:154:139/128
 2a10:4dc0:2:5::2/128
 2603:1020:203:3::a/128
 2001:19f0:1595:1403::1092/128
->>>>>>> Stashed changes
 2605:bc80:3010::134/128
 2600:3402:200:227::2/128
 2a0b:f301:2:7::2/128
@@ -294,50 +247,25 @@
 2001:67c:744:7::2/128
 2a06:1700:0:38::1/128
 2001:1328:54:fff::2/128
-<<<<<<< Updated upstream
 2a04:4e42:200::644/128
-2a04:4e42::644/128
-2a04:4e42:600::644/128
 2a04:4e42:400::644/128
-2600:9000:2764:6800:3:db06:4200:93a1/128
-2600:9000:2764:c600:3:db06:4200:93a1/128
-2600:9000:2764:de00:3:db06:4200:93a1/128
+2a04:4e42:600::644/128
+2a04:4e42::644/128
 2600:9000:2764:6a00:3:db06:4200:93a1/128
-2600:9000:2764:1000:3:db06:4200:93a1/128
-2600:9000:2764:ba00:3:db06:4200:93a1/128
-2600:9000:2764:3200:3:db06:4200:93a1/128
-2600:9000:2764:6200:3:db06:4200:93a1/128
-2a0b:7140:5:100::167/128
-2a0b:7140:5:100::167/128
-2606:50c0:8000::153/128
-2606:50c0:8003::153/128
-2606:50c0:8001::153/128
-2606:50c0:8002::153/128
-2606:50c0:8000::153/128
-2606:50c0:8001::153/128
-2606:50c0:8002::153/128
-2606:50c0:8003::153/128
-=======
-2a04:4e42:400::644/128
-2a04:4e42:200::644/128
-2a04:4e42::644/128
-2a04:4e42:600::644/128
-2600:9000:21c7:a400:3:db06:4200:93a1/128
-2600:9000:21c7:5800:3:db06:4200:93a1/128
-2600:9000:21c7:3a00:3:db06:4200:93a1/128
-2600:9000:21c7:a00:3:db06:4200:93a1/128
-2600:9000:21c7:e800:3:db06:4200:93a1/128
-2600:9000:21c7:2e00:3:db06:4200:93a1/128
-2600:9000:21c7:ce00:3:db06:4200:93a1/128
-2600:9000:21c7:1400:3:db06:4200:93a1/128
+2600:9000:2764:b000:3:db06:4200:93a1/128
+2600:9000:2764:6800:3:db06:4200:93a1/128
+2600:9000:2764:a400:3:db06:4200:93a1/128
+2600:9000:2764:5400:3:db06:4200:93a1/128
+2600:9000:2764:5a00:3:db06:4200:93a1/128
+2600:9000:2764:c600:3:db06:4200:93a1/128
+2600:9000:2764:1400:3:db06:4200:93a1/128
 2a0e:9880:304::184/128
 2a0e:9880:304::184/128
 2606:50c0:8002::153/128
-2606:50c0:8000::153/128
 2606:50c0:8001::153/128
+2606:50c0:8000::153/128
 2606:50c0:8003::153/128
 2606:50c0:8002::153/128
-2606:50c0:8000::153/128
-2606:50c0:8003::153/128
 2606:50c0:8001::153/128
->>>>>>> Stashed changes
+2606:50c0:8003::153/128
+2606:50c0:8000::153/128
diff --git a/OPNS_MirrorListV4 b/OPNS_MirrorListV4
index 616f625..5510d5f 100644
--- a/OPNS_MirrorListV4
+++ b/OPNS_MirrorListV4
@@ -1,28 +1,19 @@
 202.158.214.106/32
 200.201.197.75/32
 198.50.127.68/32
-216.24.182.173/32
 178.157.61.30/32
+216.24.182.173/32
 162.105.120.100/32
-<<<<<<< Updated upstream
-188.114.96.1/32
-188.114.97.1/32
-=======
 188.114.97.1/32
 188.114.96.1/32
->>>>>>> Stashed changes
 130.225.254.116/32
 46.32.144.253/32
 201.159.221.67/32
 201.159.221.67/32
 62.210.129.125/32
 31.38.161.123/32
-<<<<<<< Updated upstream
-=======
 172.67.206.93/32
->>>>>>> Stashed changes
 104.21.22.179/32
-172.67.206.93/32
 141.98.136.67/32
 37.208.104.98/32
 37.58.58.140/32
@@ -30,30 +21,18 @@
 91.120.155.136/32
 180.151.236.94/32
 78.39.136.13/32
-<<<<<<< Updated upstream
 104.18.3.112/32
 104.18.2.112/32
 104.18.6.32/32
 104.18.7.32/32
 104.18.6.32/32
-=======
-104.18.2.112/32
-104.18.3.112/32
-104.18.7.32/32
-104.18.6.32/32
-104.18.6.32/32
->>>>>>> Stashed changes
 104.18.7.32/32
 221.138.103.74/32
-221.142.142.68/32
-<<<<<<< Updated upstream
-=======
-14.80.36.53/32
->>>>>>> Stashed changes
+0.0.0.0/32
 14.79.156.154/32
 182.216.209.74/32
-104.18.6.32/32
 104.18.7.32/32
+104.18.6.32/32
 104.18.7.32/32
 104.18.6.32/32
 196.200.160.70/32
@@ -75,4 +54,3 @@
 209.58.135.187/32
 169.229.200.70/32
 128.82.4.140/32
-0.0.0.0/32
diff --git a/OPNS_MirrorListV6 b/OPNS_MirrorListV6
index ba1f4fc..bf6c659 100644
--- a/OPNS_MirrorListV6
+++ b/OPNS_MirrorListV6
@@ -13,26 +13,16 @@
 2a00:d0c0:d::100/128
 2a00:c98:2030:a034::21/128
 2001:648:2c00:6c08::2/128
-<<<<<<< Updated upstream
 2606:4700::6812:270/128
 2606:4700::6812:370/128
-=======
-2606:4700::6812:370/128
-2606:4700::6812:270/128
->>>>>>> Stashed changes
-2606:4700::6812:620/128
 2606:4700::6812:720/128
 2606:4700::6812:620/128
+2606:4700::6812:620/128
 2606:4700::6812:720/128
 2606:4700::6812:720/128
 2606:4700::6812:620/128
-<<<<<<< Updated upstream
 2606:4700::6812:720/128
 2606:4700::6812:620/128
-=======
-2606:4700::6812:620/128
-2606:4700::6812:720/128
->>>>>>> Stashed changes
 2001:4310:f1::70/128
 2602:faa5:189::/128
 2602:faa5:190::/128
@@ -47,4 +37,3 @@
 2604:9a00:2010:a0b8::5/128
 2605:fe80:2100:b001::5187/128
 2607:f140:0:32::70/128
-::/128