diff --git a/README.md b/README.md
index 15bea5f..62e0ed7 100644
--- a/README.md
+++ b/README.md
@@ -7,13 +7,7 @@ Either free locally (over the air):
 
 <a href="uk.md"><img src="https://hatscripts.github.io/circle-flags/flags/gb.svg" width="48"></a> <a href="usa.md"><img src="https://hatscripts.github.io/circle-flags/flags/us.svg" width="48"></a> <a href="canada.md"><img src="https://hatscripts.github.io/circle-flags/flags/ca.svg" width="48"></a> <a href="australia.md"><img src="https://hatscripts.github.io/circle-flags/flags/au.svg" width="48"></a> <a href="ireland.md"><img src="https://hatscripts.github.io/circle-flags/flags/ie.svg" width="48"></a>
 
-<<<<<<< HEAD
 <a href="spain.md"><img src="https://hatscripts.github.io/circle-flags/flags/es.svg" width="48"></a> <a href="mexico.md"><img src="https://hatscripts.github.io/circle-flags/flags/mx.svg" width="48"></a> <a href="argentina.md"><img src="https://hatscripts.github.io/circle-flags/flags/ar.svg" width="48"></a> <a href="paraguay.md"><img src="https://hatscripts.github.io/circle-flags/flags/py.svg" width="48"></a> <a href="colombia.md"><img src="https://hatscripts.github.io/circle-flags/flags/co.svg" width="48" ></a>
-=======
-<img src="https://hatscripts.github.io/circle-flags/flags/es.svg" width="48"> <img src="https://hatscripts.github.io/circle-flags/flags/mx.svg" width="48"> <img src="https://hatscripts.github.io/circle-flags/flags/ar.svg" width="48"> <img src="https://hatscripts.github.io/circle-flags/flags/py.svg" width="48"> <a href="colombia.md"><img src="https://hatscripts.github.io/circle-flags/flags/co.svg" width="48" ></a>
->>>>>>> 00c52dab6f66ee6d39cc511cb9ad64fc12a4da39
-
-<img src="https://hatscripts.github.io/circle-flags/flags/es.svg" width="48"> <img src="https://hatscripts.github.io/circle-flags/flags/mx.svg" width="48"> <img src="https://hatscripts.github.io/circle-flags/flags/ar.svg" width="48"> <img src="https://hatscripts.github.io/circle-flags/flags/py.svg" width="48"> <a href="colombia.md"><img src="https://hatscripts.github.io/circle-flags/flags/co.svg" width="48" ></a>
 
 <a href="germany.md"><img src="https://hatscripts.github.io/circle-flags/flags/de.svg" width="48"></a> <a href="austria.md"><img src="https://hatscripts.github.io/circle-flags/flags/at.svg" width="48"></a> <a href="france.md"><img src="https://hatscripts.github.io/circle-flags/flags/fr.svg" width="48"></a> <a href="belgium.md"><img src="https://hatscripts.github.io/circle-flags/flags/be.svg" width="48"></a> <a href="netherlands.md"><img src="https://hatscripts.github.io/circle-flags/flags/nl.svg" width="48"></a> <a href="switzerland.md"><img src="https://hatscripts.github.io/circle-flags/flags/ch.svg" width="48"></a> <a href="italy.md"><img src="https://hatscripts.github.io/circle-flags/flags/it.svg" width="48"></a> <a href="san_marino.md"><img src="https://hatscripts.github.io/circle-flags/flags/sm.svg" width="48">