diff --git a/MirrorListV4 b/MirrorListV4
index 4236608..c148ced 100644
--- a/MirrorListV4
+++ b/MirrorListV4
@@ -63,35 +63,20 @@
 147.229.176.19/32
 89.102.0.150/32
 195.113.250.60/32
-<<<<<<< Updated upstream
 194.71.11.163/32
 194.71.11.165/32
 194.71.11.173/32
-=======
-194.71.11.165/32
 194.71.11.173/32
-194.71.11.163/32
-194.71.11.163/32
-194.71.11.173/32
->>>>>>> Stashed changes
 194.71.11.165/32
 194.71.11.163/32
-194.71.11.173/32
 130.225.254.116/32
 77.247.64.34/32
-194.71.11.173/32
 194.71.11.163/32
-<<<<<<< Updated upstream
-194.71.11.165/32
+194.71.11.173/32
 194.71.11.165/32
 194.71.11.173/32
-194.71.11.163/32
-=======
 194.71.11.165/32
-194.71.11.173/32
 194.71.11.163/32
-194.71.11.165/32
->>>>>>> Stashed changes
 195.140.195.56/32
 193.166.3.3/32
 212.27.32.66/32
@@ -135,8 +120,8 @@
 134.76.12.6/32
 137.226.34.46/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
 139.174.32.6/32
 130.75.2.22/32
@@ -162,15 +147,12 @@
 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
+203.178.137.175/32
 85.94.199.210/32
 109.73.80.190/32
 151.0.128.28/32
-90.147.160.73/32
+193.206.214.15/32
 85.94.199.210/32
 130.251.19.2/32
 140.105.48.55/32
@@ -209,7 +191,7 @@
 153.19.251.221/32
 153.19.251.221/32
 149.156.96.11/32
-0.0.0.0/32
+193.219.28.2/32
 150.254.173.17/32
 153.19.251.222/32
 193.136.216.34/32
@@ -227,25 +209,14 @@
 195.80.174.186/32
 213.129.232.18/32
 213.129.232.18/32
-<<<<<<< Updated upstream
-151.101.130.132/32
-151.101.66.132/32
-151.101.194.132/32
-151.101.2.132/32
-151.101.2.132/32
 151.101.194.132/32
 151.101.130.132/32
 151.101.66.132/32
-=======
-151.101.66.132/32
-151.101.194.132/32
-151.101.130.132/32
-151.101.2.132/32
-151.101.130.132/32
 151.101.2.132/32
 151.101.66.132/32
 151.101.194.132/32
->>>>>>> Stashed changes
+151.101.2.132/32
+151.101.130.132/32
 80.64.47.13/32
 193.145.15.20/32
 193.146.32.81/32
@@ -256,21 +227,12 @@
 193.146.75.19/32
 155.210.4.97/32
 82.194.78.250/32
-<<<<<<< Updated upstream
-194.71.11.165/32
-194.71.11.173/32
-194.71.11.163/32
 194.71.11.163/32
 194.71.11.165/32
 194.71.11.173/32
-=======
-194.71.11.163/32
 194.71.11.173/32
 194.71.11.165/32
-194.71.11.173/32
 194.71.11.163/32
-194.71.11.165/32
->>>>>>> Stashed changes
 130.235.34.30/32
 193.11.30.180/32
 194.71.11.163/32
@@ -285,29 +247,17 @@
 193.140.98.183/32
 129.132.53.171/32
 129.132.53.171/32
-188.184.105.5/32
-<<<<<<< Updated upstream
-188.185.65.208/32
-188.184.91.52/32
+188.184.79.248/32
+188.184.23.33/32
 188.184.90.134/32
 188.184.104.250/32
-188.184.23.33/32
-188.184.79.248/32
-188.185.8.192/32
-188.184.111.122/32
-188.185.29.10/32
-=======
-188.185.29.10/32
-188.184.23.33/32
-188.184.111.122/32
-188.184.79.248/32
-188.184.104.250/32
-188.184.90.134/32
-188.185.65.208/32
-188.185.8.192/32
 188.184.91.52/32
->>>>>>> Stashed changes
 188.185.25.162/32
+188.185.29.10/32
+188.185.65.208/32
+188.184.105.5/32
+188.185.8.192/32
+188.184.111.122/32
 83.166.143.42/32
 83.166.143.43/32
 109.202.202.202/32
@@ -323,8 +273,8 @@
 90.207.225.196/32
 94.229.65.150/32
 213.230.211.73/32
-93.93.131.18/32
 46.235.229.21/32
+93.93.131.18/32
 163.1.221.67/32
 163.1.160.163/32
 80.87.134.17/32
@@ -333,40 +283,23 @@
 143.20.69.35/32
 5.180.211.190/32
 208.80.154.139/32
-<<<<<<< Updated upstream
-=======
-64.50.233.100/32
 64.50.236.52/32
 64.50.233.100/32
 208.80.154.139/32
->>>>>>> Stashed changes
-64.50.236.52/32
 64.50.233.100/32
-208.80.154.139/32
 64.50.236.52/32
-64.50.233.100/32
 92.119.16.152/32
-4.153.4.61/32
+20.61.228.89/32
 128.180.2.105/32
 128.30.3.141/32
-<<<<<<< Updated upstream
+128.226.118.12/32
+128.226.118.14/32
 128.226.118.13/32
 128.226.118.15/32
-=======
->>>>>>> Stashed changes
-128.226.118.12/32
-128.226.118.15/32
-128.226.118.14/32
 108.61.5.92/32
-<<<<<<< Updated upstream
-140.211.166.134/32
-64.50.233.100/32
-64.50.236.52/32
-=======
 64.50.236.52/32
 64.50.233.100/32
 140.211.166.134/32
->>>>>>> Stashed changes
 128.135.10.29/32
 77.247.126.176/32
 108.86.224.23/32
@@ -415,37 +348,20 @@
 185.100.87.86/32
 164.73.233.2/32
 151.101.2.132/32
+151.101.194.132/32
 151.101.130.132/32
 151.101.66.132/32
-151.101.194.132/32
-<<<<<<< Updated upstream
-3.164.240.119/32
 3.164.240.105/32
 3.164.240.73/32
+3.164.240.119/32
 3.164.240.123/32
+45.84.67.184/32
 212.224.123.70/32
-45.84.67.184/32
+185.199.111.153/32
 185.199.109.153/32
+185.199.110.153/32
 185.199.108.153/32
 185.199.111.153/32
 185.199.110.153/32
 185.199.109.153/32
 185.199.108.153/32
-185.199.111.153/32
-=======
-151.101.66.132/32
-3.164.240.105/32
-3.164.240.73/32
-3.164.240.119/32
-3.164.240.123/32
-185.219.221.167/32
-45.84.67.184/32
-185.199.111.153/32
-185.199.110.153/32
-185.199.108.153/32
-185.199.109.153/32
-185.199.109.153/32
->>>>>>> Stashed changes
-185.199.110.153/32
-185.199.111.153/32
-185.199.108.153/32
diff --git a/MirrorListV6 b/MirrorListV6
index 7f60211..022c983 100644
--- a/MirrorListV6
+++ b/MirrorListV6
@@ -49,34 +49,20 @@
 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
-2001:6b0:19::173/128
-2001:6b0:19::163/128
-2001:6b0:19::173/128
-=======
-2001:6b0:19::173/128
-2001:6b0:19::165/128
->>>>>>> Stashed changes
 2001:6b0:19::163/128
 2001:6b0:19::165/128
 2001:6b0:19::173/128
+2001:6b0:19::173/128
+2001:6b0:19::165/128
 2001:6b0:19::163/128
 2001:878:346::116/128
 2a02:4de0:21::2/128
-<<<<<<< Updated upstream
 2001:6b0:19::163/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
 2001:6b0:19::163/128
->>>>>>> Stashed changes
 2001:6b0:19::165/128
 2001:6b0:19::173/128
-2001:6b0:19::163/128
 2001:67c:2b0:19:201:aeff:fe64:6562/128
 2001:708:10:8::3/128
 2a01:e0c:1:1598::2/128
@@ -90,8 +76,8 @@
 2001:660:4208:100::24/128
 2001:660:2402::6/128
 2a0c:1100:100:0:1:c2d6:dac1:0/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
 2001:660:500b:245::145/128
 2a02:cbf7:100::400/128
@@ -110,8 +96,8 @@
 2a06:93c7:f0::f79/128
 2a00:8a60:e012:a00::21/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:605:20:1::6/128
 2001:638:208:ef1b:0:ff:fe00:4/128
@@ -137,11 +123,7 @@
 2001:4b78:2000:1::1/128
 2001:4b78:2000:1::1/128
 2a00:1cc8:0:ff0a::2/128
-<<<<<<< Updated upstream
-2001:760:ffff:b6:4:100:0:73/128
-=======
 2001:760:ffff:bf::aa/128
->>>>>>> Stashed changes
 2001:4b78:2000:1::1/128
 2001:760:2e03::ca:26:0/128
 2a05:7cc0::91:211:244:15/128
@@ -157,7 +139,7 @@
 2a14:3f87:c800:2980::2980/128
 2001:678:d64:564d::443/128
 2a01:1b0:7999:419::3/128
-2a00:1630:3400::213/128
+2a00:1630:3400::214/128
 2a00:1768:1000:22:1::1/128
 2a0f:ca80:1337::da0:c1c5/128
 2a02:6ea0:c036::10/128
@@ -174,64 +156,43 @@
 2001:4070:1:2::3/128
 2001:4070:1:2::3/128
 2001:6d8:10:1060::600b/128
-::/128
+2001:6a0:0:31::2/128
 2001:808::173:17/128
 2001:4070:1:2::2/128
 2001:690:2006:200::34/128
 2001:690:2006:200::34/128
 2001:690:2006:200::34/128
 2001:690:2100:80::6/128
-2602:faa5:189::/128
 2602:faa5:190::/128
+2602:faa5:189::/128
 2a00:1650:1000:0:8fc7:3f4f:8629:b7fc/128
 2a0c:c500:fe04::30/128
 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:400::644/128
 2a04:4e42::644/128
-2a04:4e42:200::644/128
-2a04:4e42:400::644/128
-2a04:4e42::644/128
-2a04:4e42:600::644/128
-=======
 2a04:4e42:400::644/128
 2a04:4e42:600::644/128
 2a04:4e42:200::644/128
+2a04:4e42:600::644/128
 2a04:4e42::644/128
 2a04:4e42:200::644/128
-2a04:4e42::644/128
-2a04:4e42:600::644/128
 2a04:4e42:400::644/128
->>>>>>> Stashed changes
 2001:720:424:1::1:20/128
 2001:720:1214:4200::81/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::165/128
 2001:6b0:19::173/128
+2001:6b0:19::165/128
 2001:6b0:19::163/128
-=======
->>>>>>> Stashed changes
 2001:6b0:19::165/128
 2001:6b0:19::163/128
 2001:6b0:19::173/128
-2001:6b0:19::173/128
-2001:6b0:19::163/128
-2001:6b0:19::165/128
 2001:6b0:5:50::180/128
-<<<<<<< Updated upstream
 2001:6b0:19::165/128
-=======
->>>>>>> Stashed changes
 2001:6b0:19::173/128
 2001:6b0:19::163/128
-2001:6b0:19::165/128
 2a01:8e01:c1ea:6c5c::5/128
 2a01:8e01:c1ea:6c5c::8/128
 2a02:750:9::e8/128
@@ -240,31 +201,17 @@
 2001:e10:2000:240:e643:4bff:fee8:a63c/128
 2001:67c:10ec:3dd1::42/128
 2001:67c:10ec:3dd1::42/128
-<<<<<<< Updated upstream
-2001:1458:d00:63::100:106/128
-2001:1458:d00:34::100:328/128
-2001:1458:d00:2c::100:229/128
-2001:1458:d00:68::100:e4/128
-2001:1458:d00:6f::100:89/128
-2001:1458:d00:1::100:408/128
-2001:1458:201:e4::100:22c/128
 2001:1458:d00:2d::100:1cb/128
-2001:1458:d00:67::100:429/128
-2001:1458:201:e4::100:35c/128
-2001:1458:d00:2d::100:d4/128
-=======
-2001:1458:d00:1::100:408/128
-2001:1458:d00:2c::100:229/128
-2001:1458:d00:34::100:328/128
-2001:1458:201:e4::100:22c/128
-2001:1458:d00:2d::100:1cb/128
-2001:1458:d00:2d::100:d4/128
-2001:1458:d00:67::100:429/128
-2001:1458:d00:63::100:106/128
 2001:1458:d00:6f::100:89/128
-2001:1458:d00:68::100:e4/128
+2001:1458:201:e4::100:22c/128
+2001:1458:d00:2d::100:d4/128
+2001:1458:d00:63::100:106/128
+2001:1458:d00:67::100:429/128
+2001:1458:d00:2c::100:229/128
 2001:1458:201:e4::100:35c/128
->>>>>>> Stashed changes
+2001:1458:d00:34::100:328/128
+2001:1458:d00:68::100:e4/128
+2001:1458:d00:1::100:408/128
 2001:1600:0:aaaa::2:2/128
 2001:1600:0:aaaa::2:1/128
 2001:1620::1620/128
@@ -284,22 +231,16 @@
 2a0f:85c1:c3b:2010::35/128
 2a0d:5082:0:7::2/128
 2600:3404:200:237::2/128
-2620:0:861:2:208:80:154:139/128
 2600:3402:200:227::2/128
-2600:3402:200:227::2/128
-2600:3404:200:237::2/128
 2620:0:861:2:208:80:154:139/128
-<<<<<<< Updated upstream
-=======
 2600:3404:200:237::2/128
 2620:0:861:2:208:80:154:139/128
 2600:3402:200:227::2/128
->>>>>>> Stashed changes
 2a10:4dc0:2:5::2/128
-2603:1030:403:3::cee/128
+2603:1030:c02:9::507/128
 2001:19f0:1595:1403::1092/128
-2600:3402:200:227::2/128
 2605:bc80:3010::134/128
+2600:3402:200:227::2/128
 2600:3404:200:237::2/128
 2a0b:f301:2:7::2/128
 2604:2dc0:200:1b57::a/128
@@ -332,47 +273,25 @@
 2001:67c:744:7::2/128
 2a06:1700:0:38::1/128
 2001:1328:54:fff::2/128
-2a04:4e42:200::644/128
 2a04:4e42:400::644/128
-2a04:4e42::644/128
+2a04:4e42:200::644/128
 2a04:4e42:600::644/128
-<<<<<<< Updated upstream
-2600:9000:2764:0:3:db06:4200:93a1/128
-2600:9000:2764:4600:3:db06:4200:93a1/128
-2600:9000:2764:8a00:3:db06:4200:93a1/128
-2600:9000:2764:600:3:db06:4200:93a1/128
-2600:9000:2764:3e00:3:db06:4200:93a1/128
-2600:9000:2764:b600:3:db06:4200:93a1/128
-2600:9000:2764:f400:3:db06:4200:93a1/128
-2600:9000:2764:6c00:3:db06:4200:93a1/128
-2a0b:7140:5:100::167/128
-2a0b:7140:5:100::167/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:8002::153/128
-2606:50c0:8001::153/128
-=======
 2a04:4e42::644/128
-2600:9000:2764:ac00:3:db06:4200:93a1/128
-2600:9000:2764:4200:3:db06:4200:93a1/128
-2600:9000:2764:fc00:3:db06:4200:93a1/128
-2600:9000:2764:4a00:3:db06:4200:93a1/128
-2600:9000:2764:8e00:3:db06:4200:93a1/128
-2600:9000:2764:a00:3:db06:4200:93a1/128
-2600:9000:2764:e400:3:db06:4200:93a1/128
-2600:9000:2764:8600:3:db06:4200:93a1/128
-2a01:7e0:0:424::249/128
-2a01:7e0:0:424::249/128
+2600:9000:234e:4200:3:db06:4200:93a1/128
+2600:9000:234e:6a00:3:db06:4200:93a1/128
+2600:9000:234e:aa00:3:db06:4200:93a1/128
+2600:9000:234e:4a00:3:db06:4200:93a1/128
+2600:9000:234e:6e00:3:db06:4200:93a1/128
+2600:9000:234e:8c00:3:db06:4200:93a1/128
+2600:9000:234e:1600:3:db06:4200:93a1/128
+2600:9000:234e:6c00:3:db06:4200:93a1/128
+2a0e:9880:304::184/128
+2a0b:7140:5:100::167/128
 2606:50c0:8000::153/128
 2606:50c0:8003::153/128
 2606:50c0:8002::153/128
 2606:50c0:8001::153/128
-2606:50c0:8001::153/128
-2606:50c0:8000::153/128
-2606:50c0:8002::153/128
 2606:50c0:8003::153/128
->>>>>>> Stashed changes
+2606:50c0:8001::153/128
+2606:50c0:8002::153/128
+2606:50c0:8000::153/128
diff --git a/OPNS_MirrorListV4 b/OPNS_MirrorListV4
index 7c6271d..e7a83c2 100644
--- a/OPNS_MirrorListV4
+++ b/OPNS_MirrorListV4
@@ -1,25 +1,15 @@
 202.158.214.106/32
 200.201.197.203/32
-178.157.61.30/32
 216.24.182.173/32
+178.157.61.30/32
 162.105.120.100/32
-<<<<<<< Updated upstream
-=======
-104.21.80.1/32
 104.21.48.1/32
->>>>>>> Stashed changes
+104.21.16.1/32
+104.21.112.1/32
 104.21.96.1/32
 104.21.80.1/32
 104.21.64.1/32
-104.21.112.1/32
-104.21.16.1/32
 104.21.32.1/32
-<<<<<<< Updated upstream
-104.21.48.1/32
-=======
-104.21.64.1/32
-104.21.112.1/32
->>>>>>> Stashed changes
 130.225.254.116/32
 46.32.144.253/32
 201.159.221.67/32
@@ -33,22 +23,13 @@
 147.52.159.50/32
 180.151.236.94/32
 78.39.136.13/32
-<<<<<<< Updated upstream
 104.18.2.39/32
 104.18.3.39/32
 112.222.241.182/32
 104.21.12.56/32
 172.67.193.177/32
 221.138.103.74/32
-=======
-104.18.3.39/32
-104.18.2.39/32
-112.222.241.182/32
-172.67.193.177/32
-104.21.12.56/32
-221.138.103.74/32
 0.0.0.0/32
->>>>>>> Stashed changes
 175.233.142.67/32
 196.200.160.70/32
 150.242.40.7/32
diff --git a/OPNS_MirrorListV6 b/OPNS_MirrorListV6
index b0dde3c..dfd9ac1 100644
--- a/OPNS_MirrorListV6
+++ b/OPNS_MirrorListV6
@@ -1,22 +1,12 @@
 2001:388:30bc:cafe::beef/128
 2001:da8:201:1120::a269:7864/128
-<<<<<<< Updated upstream
-2606:4700:3030::6815:2001/128
-2606:4700:3030::6815:5001/128
+2606:4700:3030::6815:6001/128
+2606:4700:3030::6815:3001/128
 2606:4700:3030::6815:7001/128
 2606:4700:3030::6815:4001/128
-2606:4700:3030::6815:3001/128
 2606:4700:3030::6815:1001/128
-2606:4700:3030::6815:6001/128
-=======
-2606:4700:3030::6815:1001/128
-2606:4700:3030::6815:3001/128
-2606:4700:3030::6815:4001/128
-2606:4700:3030::6815:6001/128
-2606:4700:3030::6815:2001/128
-2606:4700:3030::6815:7001/128
 2606:4700:3030::6815:5001/128
->>>>>>> Stashed changes
+2606:4700:3030::6815:2001/128
 2001:878:346::116/128
 2001:470:dd11:1337:d0cd:bfff:feaa:fb37/128
 2800:68:0:bebe::3/128
@@ -26,14 +16,11 @@
 2a00:d0c0:d::100/128
 2a00:c98:2030:a034::21/128
 2001:648:2c00:6c08::2/128
-2606:4700::6812:327/128
 2606:4700::6812:227/128
-2606:4700:3036::6815:c38/128
+2606:4700::6812:327/128
 2606:4700:3034::ac43:c1b1/128
-<<<<<<< Updated upstream
-=======
+2606:4700:3036::6815:c38/128
 ::/128
->>>>>>> Stashed changes
 2001:4310:f1::70/128
 2602:faa5:189::/128
 2602:faa5:190::/128