diff --git a/readme.txt b/readme.txt
index 5e751ca..17bd826 100644
--- a/readme.txt
+++ b/readme.txt
@@ -4,13 +4,8 @@ Contributors: christophherr
 Donate link: https://www.christophherr.com/donate/
 Tags: woothemes sensei, woothemes, genesis, genesis connect, studiopress
 Requires at least: 4.1
-<<<<<<< HEAD
 Tested up to: 4.4
 Stable tag: 1.0.3
-=======
-Tested up to: 4.3
-Stable tag: 1.0.1
->>>>>>> clean up git
 License: GPL-2.0+
 License URI: http://www.gnu.org/licenses/gpl-2.0.txt
 
@@ -59,7 +54,6 @@ There are no settings and no settings screen. You would have to change the code
 
 == Changelog ==
 
-<<<<<<< HEAD
 = 1.0.3 =
 
 * Corrected oversight in original code. First closing tag should be `</main>` instead of `</div>`
@@ -69,8 +63,6 @@ see: http://cobaltapps.com/forum/forum/main-category/main-forum/81542-woo-sensei
 
 * POT file added
 
-=======
->>>>>>> clean up git
 = 1.0.1 =
 
 * Loading textdomain for i18n
@@ -81,7 +73,6 @@ see: http://cobaltapps.com/forum/forum/main-category/main-forum/81542-woo-sensei
 
 == Upgrade Notice ==
 
-<<<<<<< HEAD
 = 1.0.3 =
 
 This version corrects an oversight in the original code
@@ -94,8 +85,3 @@ This version adds a POT file for translations.
 = 1.0.1 =
 
 This version loads the textdomain to enable translations.
-=======
-= 1.0.1 =
-
-This version loads the textdomain to enable translations
->>>>>>> clean up git