diff --git a/set.h b/set.h
index 01e9cca9..7cb62348 100644
--- a/set.h
+++ b/set.h
@@ -1,4 +1,10 @@
+<<<<<<< Updated upstream
 //===============FIRMWARE SETTINGS=====================================
+=======
+/*******************************************************************
+ **********************FIRMWARE SETTINGS****************************
+ ******************************************************************/
+>>>>>>> Stashed changes
 String firmware_version = "2.3.3";
 boolean mb_4_of_memory = true;
 //#define OTA_enable