diff --git a/hardware/arduino/boards.txt b/hardware/arduino/boards.txt
index 57fe2227c..10a74f1aa 100644
--- a/hardware/arduino/boards.txt
+++ b/hardware/arduino/boards.txt
@@ -1,9 +1,9 @@
 ##############################################################
 
 leonardo.name=Arduino Leonardo
-leonardo.upload.protocol=stk500
+leonardo.upload.protocol=arduino
 leonardo.upload.maximum_size=30720
-leonardo.upload.speed=300
+leonardo.upload.speed=1200
 leonardo.bootloader.low_fuses=0xde
 leonardo.bootloader.high_fuses=0xd8
 leonardo.bootloader.extended_fuses=0xf3
diff --git a/hardware/arduino/cores/arduino/CDC.cpp b/hardware/arduino/cores/arduino/CDC.cpp
index 0d04b9c7d..3ad3e9849 100644
--- a/hardware/arduino/cores/arduino/CDC.cpp
+++ b/hardware/arduino/cores/arduino/CDC.cpp
@@ -95,7 +95,7 @@ bool WEAK CDC_Setup(Setup& setup)
 		if (CDC_SET_LINE_CODING == r)
 		{
 			USB_RecvControl((void*)&_usbLineInfo,7);
-			if (300 == _usbLineInfo.dwDTERate)		// auto-reset is triggered when avrdude opens the port at 1200 bps
+			if (1200 == _usbLineInfo.dwDTERate)		// auto-reset is triggered when avrdude opens the port at 1200 bps
 				Reboot();							
 
 			return true;
diff --git a/hardware/arduino/cores/arduino/HardwareSerial.cpp b/hardware/arduino/cores/arduino/HardwareSerial.cpp
index a31b26616..613f25279 100644
--- a/hardware/arduino/cores/arduino/HardwareSerial.cpp
+++ b/hardware/arduino/cores/arduino/HardwareSerial.cpp
@@ -167,11 +167,6 @@ inline void store_char(unsigned char c, ring_buffer *buffer)
   #error SIG_USART3_RECV
 #endif
 
-<<<<<<< HEAD
-#if !defined(USART0_UDRE_vect) && defined(USART1_UDRE_vect)
-// do nothing - on the 32u4 the first USART is USART1
-#else
-=======
 void serialEventRun(void)
 {
   unsigned char flag, oldSREG;
@@ -210,7 +205,9 @@ void serialEventRun(void)
 }
 
 
->>>>>>> 0c92f230b5202b241de875a3baff9dfd1cf7a618
+#if !defined(USART0_UDRE_vect) && defined(USART1_UDRE_vect)
+// do nothing - on the 32u4 the first USART is USART1
+#else
 #if !defined(UART0_UDRE_vect) && !defined(UART_UDRE_vect) && !defined(USART0_UDRE_vect) && !defined(USART_UDRE_vect)
   #error Don't know what the Data Register Empty vector is called for the first UART
 #else