diff --git a/includes/classes/wp-maintenance-mode.php b/includes/classes/wp-maintenance-mode.php
index 747b3bd3..4ae0be19 100644
--- a/includes/classes/wp-maintenance-mode.php
+++ b/includes/classes/wp-maintenance-mode.php
@@ -4,11 +4,7 @@
 
     class WP_Maintenance_Mode {
 
-<<<<<<< HEAD
         const VERSION = '2.0.6';
-=======
-        const VERSION = '2.0.5';
->>>>>>> master
 
         protected $plugin_slug = 'wp-maintenance-mode';
         protected $plugin_settings;
diff --git a/readme.md b/readme.md
index fd54e26d..151a4aa1 100755
--- a/readme.md
+++ b/readme.md
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 # Version 2.0.6
-=======
-# Version 2.0.5
->>>>>>> master
 
 # WP Maintenance Mode
 
diff --git a/readme.txt b/readme.txt
index 5d625424..35a1edf1 100644
--- a/readme.txt
+++ b/readme.txt
@@ -7,11 +7,7 @@ Author URI: http://designmodo.com/
 Tags: maintenance mode, admin, administration, unavailable, coming soon, multisite, landing page, under construction, contact form, subscribe, countdown
 Requires at least: 3.5
 Tested up to: 4.5.2
-<<<<<<< HEAD
 Stable tag: 2.0.6
-=======
-Stable tag: 2.0.5
->>>>>>> master
 License: GPL-2.0+
 
 Adds a splash page to your site that lets visitors know your site is down for maintenance. It's perfect for a coming soon page.
@@ -75,13 +71,10 @@ If you change your login url, please add the new slug (url: http://domain.com/ne
 
 == Changelog ==
 
-<<<<<<< HEAD
 = 2.0.6 (20/06/2016) =
 * notifications update
 * languages update
 
-=======
->>>>>>> master
 = 2.0.5 (17/06/2016) =
 * roles (array) fix
 
diff --git a/wp-maintenance-mode.php b/wp-maintenance-mode.php
index d0409668..50b46a99 100755
--- a/wp-maintenance-mode.php
+++ b/wp-maintenance-mode.php
@@ -6,11 +6,7 @@
  * Plugin Name: WP Maintenance Mode
  * Plugin URI: http://designmodo.com/
  * Description: Adds a splash page to your site that lets visitors know your site is down for maintenance. It's perfect for a coming soon page.
-<<<<<<< HEAD
  * Version: 2.0.6
-=======
- * Version: 2.0.5
->>>>>>> master
  * Author: Designmodo
  * Author URI: http://designmodo.com/
  * Twitter: designmodo