diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index 6b7532349..16b4dcde0 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -1189,7 +1189,11 @@ foreach ($config['os'] as $this_os => $blah)
   }
 }
 
+<<<<<<< HEAD
 // Meraki
+=======
+// Meraki Devices
+>>>>>>> 8b9323852cb4acdbedecca17c7a1a2fc8a53155f
 $os = "merakimx";
 $config['os'][$os]['text']              = "Meraki MX Appliance";
 $config['os'][$os]['type']              = "firewall";