diff --git a/Multiprotocol/FrSkyX_cc2500.ino b/Multiprotocol/FrSkyX_cc2500.ino
index fb514c7..08fc29b 100644
--- a/Multiprotocol/FrSkyX_cc2500.ino
+++ b/Multiprotocol/FrSkyX_cc2500.ino
@@ -154,17 +154,7 @@ static void __attribute__((unused)) frskyX_data_frame()
 		packet[9+i+2]=chan_1>>4;
 	}
 
-<<<<<<< HEAD
 	packet[21] = (FrX_receive_seq << 4) | FrX_send_seq ;//8 at start
-=======
-	packet[21] = seq_last_sent << 4 | seq_last_rcvd;//8 at start
-	if (seq_last_sent < 0x08 && seq_last_rcvd < 8)
-		seq_last_sent = (seq_last_sent + 1) % 4;
-	else if (seq_last_rcvd == 0x00)
-		seq_last_sent = 1;
-	else
-		seq_last_rcvd = 8;
->>>>>>> dd3f8b4717c03dc2f86701191dc8b265d4706751
 	
 	if(sub_protocol & 1 )// in X8 mode send only 8ch every 9ms
 		lpass = 0 ;
diff --git a/Multiprotocol/Validate.h b/Multiprotocol/Validate.h
index f6077ec..f086a16 100644
--- a/Multiprotocol/Validate.h
+++ b/Multiprotocol/Validate.h
@@ -4,7 +4,7 @@
 #endif
 #if not defined (ORANGE_TX) && not defined (STM32_BOARD)
 	//Atmega328p
-	#if not defined(ARDUINO_AVR_PRO) && not defined(ARDUINO_AVR_MINI) && not defined(ARDUINO_AVR_NANO)
+	#if not defined(ARDUINO_AVR_PRO) && not defined(ARDUINO_MULTI_NO_BOOT) && not defined(ARDUINO_MULTI_FLASH_FROM_TX) && not defined(ARDUINO_AVR_MINI) && not defined(ARDUINO_AVR_NANO)
 		#error You must select one of these boards: "Multi 4-in-1", "Arduino Pro or Pro Mini" or "Arduino Mini"
 	#endif
 	#if F_CPU != 16000000L || not defined(__AVR_ATmega328P__)
@@ -18,6 +18,14 @@
 	#endif
 #endif
 
+//Change/Force configuration for the bootloader option
+#if defined ARDUINO_MULTI_FLASH_FROM_TX
+	#define CHECK_FOR_BOOTLOADER
+#endif
+#if defined ARDUINO_MULTI_NO_BOOT
+	#undef CHECK_FOR_BOOTLOADER
+#endif
+
 //Change/Force configuration if OrangeTX
 #ifdef ORANGE_TX
 	#undef ENABLE_PPM			// Disable PPM for OrangeTX module
diff --git a/Multiprotocol/_Config.h b/Multiprotocol/_Config.h
index 98645b7..ba1fcc6 100644
--- a/Multiprotocol/_Config.h
+++ b/Multiprotocol/_Config.h
@@ -54,7 +54,7 @@
 /*************************/
 //Allow flashing multimodule directly with TX(erky9x or opentx modified firmwares)
 //Check https://github.com/pascallanger/DIY-Multiprotocol-TX-Module/tree/master/BootLoaders
-//To enable this feature remove the "//" on the next line.
+//To enable this feature remove the "//" on the next line. It is automatically enabled/disabled when you use the AVR Multi boards.
 //#define CHECK_FOR_BOOTLOADER
 
 /****************/