diff --git a/compiled/due/uploadOTA.bat b/compiled/due/uploadOTA.bat
index b553413..c4b8664 100644
--- a/compiled/due/uploadOTA.bat
+++ b/compiled/due/uploadOTA.bat
@@ -1 +1,5 @@
+<<<<<<< HEAD
 ..\tools\win\arduinoOTA.exe -address 192.168.88.21 -port 65280 -username arduino -password password -sketch firmware.bin -b -upload /sketch
+=======
+..\tools\win\arduinoOTA.exe -address 192.168.88.21 -port 65280 -username arduino -password password -sketch firmware.bin -b -upload /sketch
+>>>>>>> 9b164a1dfc40ee0e8f29dbedff4f3954edf55d76
diff --git a/compiled/lighthub21/uploadOTA.bat b/compiled/lighthub21/uploadOTA.bat
index b553413..c4b8664 100644
--- a/compiled/lighthub21/uploadOTA.bat
+++ b/compiled/lighthub21/uploadOTA.bat
@@ -1 +1,5 @@
+<<<<<<< HEAD
 ..\tools\win\arduinoOTA.exe -address 192.168.88.21 -port 65280 -username arduino -password password -sketch firmware.bin -b -upload /sketch
+=======
+..\tools\win\arduinoOTA.exe -address 192.168.88.21 -port 65280 -username arduino -password password -sketch firmware.bin -b -upload /sketch
+>>>>>>> 9b164a1dfc40ee0e8f29dbedff4f3954edf55d76