there were few problems

readme.txt

@@ -4,11 +4,7 @@ Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_i
 Tags: comments, spam, optimize, database, revisions, users, posts, trash, schedule, automatic, clean, phpmyadmin, meta, postmeta, responsive, mobile
 Requires at least: 3.7
 Tested up to: 3.9.1.nightly
-<<<<<<< HEAD
 Stable tag: 1.8.2
-=======
-Stable tag: 1.8.1
->>>>>>> 48a165cfa7f8aa59a9b00c0a9d9d32b569a2e7bb
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -18,11 +14,7 @@ Simple but effective plugin allows you to extensively clean up your WordPress da
 
 WP-Optimize is an extensive WordPress database cleanup and optimization tool. It doesn't require PhpMyAdmin to clean and optimize your database tables. 
 
-<<<<<<< HEAD
-Please show your support for this plugin by giving it [a rating](http://wordpress.org/support/view/plugin-reviews/wp-optimize?rate=5#postform)!
-=======
-Please show your support for this plugin by giving it [a rating](http://wordpress.org/support/view/plugin-reviews/fields-framework?rate=5#postform)!
->>>>>>> 48a165cfa7f8aa59a9b00c0a9d9d32b569a2e7bb
+Please show your support for this plugin by giving it [a rating](http://wordpress.org/support/view/plugin-reviews/wp-optimize?rate=5#postform)!
 
 Now hosted at [GitHub](https://github.com/ruhanirabin/WP-Optimize). I do not monitor wp forums, so use plugins+support(at)ruhanirabin.com for support questions. 
 
@@ -168,7 +160,6 @@ Please check your database for corrupted tables. That can happen, usually your w
 
 == Changelog ==
 
-<<<<<<< HEAD
 = 1.8.2 =
 * Minor fixes
 
@@ -182,7 +173,6 @@ Please check your database for corrupted tables. That can happen, usually your w
 * All translations updates will come in soon
 * I do not monitor WP forums, support email at plugins+support(at)ruhanirabin.com
 
-=======
 = 1.8.1 =
 * A whole lot more code optimization
 * Slick new interface
@@ -193,7 +183,6 @@ Please check your database for corrupted tables. That can happen, usually your w
 * All translations updates will come in soon
 * I do not monitor WP forums, support email at plugins+support(at)ruhanirabin.com
 
->>>>>>> 48a165cfa7f8aa59a9b00c0a9d9d32b569a2e7bb
 = 1.7.4 =
 * More Translation compatibility.
 * Added MYSQL and PHP versions beside the Optimizer tab.

wp-optimize.php

@@ -3,11 +3,7 @@
 Plugin Name: WP-Optimize
 Plugin URI: http://www.ruhanirabin.com/wp-optimize/
 Description: This plugin helps you to keep your database clean by removing post revisions and spams in a blaze. Additionally it allows you to run optimize command on your WordPress core tables (use with caution).
-<<<<<<< HEAD
 Version: 1.8.2
-=======
-Version: 1.8.1
->>>>>>> 48a165cfa7f8aa59a9b00c0a9d9d32b569a2e7bb
 Author: Ruhani Rabin
 Author URI: https://github.com/ruhanirabin/WP-Optimize
 Text Domain: wp-optimize
@@ -47,11 +43,7 @@
 global $current_user;
 
 if (! defined('WPO_VERSION'))
-<<<<<<< HEAD
     define('WPO_VERSION', '1.8.2');
-=======
-    define('WPO_VERSION', '1.8.1');
->>>>>>> 48a165cfa7f8aa59a9b00c0a9d9d32b569a2e7bb
 
 if (! defined('WPO_PLUGIN_MAIN_PATH'))
 	define('WPO_PLUGIN_MAIN_PATH', plugin_dir_path( __FILE__ ));