diff --git a/blocks.php b/blocks.php
index 6c8da8d..861ad22 100644
--- a/blocks.php
+++ b/blocks.php
@@ -2,7 +2,7 @@
 /**
  * Plugin Name:     Noor Blocks
  * Description:     Collection of custom blocks.
- * Version: 				1.1.3
+ * Version: 				1.1.7
  * Author:          Noor Digital Agency
  * Author URI:      https://noordigital.com
  * Text Domain:     blocks
diff --git a/readme.txt b/readme.txt
index 213bbdf..c2aa9a3 100644
--- a/readme.txt
+++ b/readme.txt
@@ -3,7 +3,7 @@ Contributors:
 Tags:              block
 Requires at least: 5.3.2
 Tested up to:      5.4.1
-Stable tag:        1.1.3
+Stable tag:        1.1.7
 Requires PHP:      7.0.0
 License:           GPL-2.0-or-later
 License URI:       https://www.gnu.org/licenses/gpl-2.0.html
diff --git a/src/filters/attributes.js b/src/filters/attributes.js
index 5c595dc..e18fd73 100644
--- a/src/filters/attributes.js
+++ b/src/filters/attributes.js
@@ -13,7 +13,6 @@ export const attributes = (settings, name) => {
   if ( 'core/button' === name ) {
 
     Object.assign(settings.attributes, {
-<<<<<<< HEAD
       useIcon: {
         type: 'boolean',
         default: true
@@ -26,9 +25,6 @@ export const attributes = (settings, name) => {
           type: 'string',
           default: 'arrow-right-alt'
       }
-=======
-      ...inlineIconAttributes
->>>>>>> a47aee9a909a9db0d84cb1bf537e08b971c8f5aa
     });
   }