diff --git a/icons-dark/actions/16/dialog-input-devices.svg b/icons-dark/actions/16/dialog-input-devices.svg
--- a/icons-dark/actions/16/dialog-input-devices.svg
+++ b/icons-dark/actions/16/dialog-input-devices.svg
@@ -1,20 +1,8 @@
 <svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
     <style type="text/css" id="current-color-scheme">
-<<<<<<< HEAD
-      .ColorScheme-Text {
-        color:#eff0f1;
-      }
-      </style>
-  </defs>
- <path style="fill:currentColor;fill-opacity:1;stroke:none" 
-     d="M 4 2 L 4 14 L 13 14 L 13 2 L 4 2 z M 5 3 L 8 3 L 8 7 L 9 7 L 9 3 L 12 3 L 12 13 L 5 13 L 5 3 z "
-     class="ColorScheme-Text"
-     />
-=======
         .ColorScheme-Text {
             color:#eff0f1;
         }
     </style>
     <path d="M8 2a4 4 0 0 0-4 4v4a4 4 0 0 0 4 4h1a4 4 0 0 0 4-4V6a4 4 0 0 0-4-4zm0 1h1a3 3 0 0 1 3 3v4a3 3 0 0 1-3 3H8a3 3 0 0 1-3-3V6a3 3 0 0 1 3-3zm0 1v3h1V4z" fill="currentColor" class="ColorScheme-Text"/>
->>>>>>> Add mouse button icons
 </svg>
diff --git a/icons/actions/16/dialog-input-devices.svg b/icons/actions/16/dialog-input-devices.svg
--- a/icons/actions/16/dialog-input-devices.svg
+++ b/icons/actions/16/dialog-input-devices.svg
@@ -1,20 +1,8 @@
 <svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
     <style type="text/css" id="current-color-scheme">
-<<<<<<< HEAD
-      .ColorScheme-Text {
-        color:#232629;
-      }
-      </style>
-  </defs>
- <path style="fill:currentColor;fill-opacity:1;stroke:none" 
-     d="M 4 2 L 4 14 L 13 14 L 13 2 L 4 2 z M 5 3 L 8 3 L 8 7 L 9 7 L 9 3 L 12 3 L 12 13 L 5 13 L 5 3 z "
-     class="ColorScheme-Text"
-     />
-=======
         .ColorScheme-Text {
             color:#232629;
         }
     </style>
     <path d="M8 2a4 4 0 0 0-4 4v4a4 4 0 0 0 4 4h1a4 4 0 0 0 4-4V6a4 4 0 0 0-4-4zm0 1h1a3 3 0 0 1 3 3v4a3 3 0 0 1-3 3H8a3 3 0 0 1-3-3V6a3 3 0 0 1 3-3zm0 1v3h1V4z" fill="currentColor" class="ColorScheme-Text"/>
->>>>>>> Add mouse button icons
 </svg>