diff --git a/tonik-gin.php b/tonik-gin.php
index a97cbec..685f1c1 100644
--- a/tonik-gin.php
+++ b/tonik-gin.php
@@ -4,11 +4,7 @@
 Plugin Name: tonik/gin
 Plugin URI: http://tonik.pl
 Description: Foundation of the Tonik WordPress Starter Theme. Provides all custom functionalities which it offers.
-<<<<<<< HEAD
-Version: 3.0.0
-=======
 Version: 3.1.0
->>>>>>> release-3.1.0
 Author: Tonik
 Author URI: http://tonik.pl
 License: GPL-2.0+