diff --git a/README.md b/README.md
index 40e2b28..79f178f 100644
--- a/README.md
+++ b/README.md
@@ -15,11 +15,8 @@ These themes have been tested and work:
 - Adapta
 - Adwaita
 - Arc
-<<<<<<< HEAD
 - Canta
-=======
 - Flat-Remix-GTK
->>>>>>> theme-flat-remix-gtk
 - HighContrast
 - Layan
 - Matcha (thank you @Chrysostomus)