diff --git a/Modbus/src/ModbusMaster.cpp b/Modbus/src/ModbusMaster.cpp
index bf532c5..4dee284 100644
--- a/Modbus/src/ModbusMaster.cpp
+++ b/Modbus/src/ModbusMaster.cpp
@@ -39,10 +39,7 @@ Arduino library for communicating with Modbus slaves over RS232/485 (via RTU pro
 #elif defined(ARDUINO_ARCH_SAM)
   UARTClass* MBSerial = &Serial; ///< Pointer to Serial class object
 #else
-<<<<<<< HEAD
 //In the case of undefined Serial the code should still function
-=======
->>>>>>> bada194ebe7490c25ca7589366224d4ae0f80eab
 //  #error "This library only supports boards with an AVR or SAM processor. Please open an issue at https://github.com/4-20ma/ModbusMaster/issues and indicate which processor/platform you're using."
 #endif