diff --git a/flight/Revolution/Makefile b/flight/Revolution/Makefile
index 3f75742cd..d19ef15e0 100644
--- a/flight/Revolution/Makefile
+++ b/flight/Revolution/Makefile
@@ -196,8 +196,8 @@ EXTRAINCDIRS  += $(STMSPDINCDIR)
 EXTRAINCDIRS  += $(CMSISDIR)
 EXTRAINCDIRS  += $(OPUAVSYNTHDIR)
 EXTRAINCDIRS  += $(BOOTINC)
-<<<<<<< HEAD
 EXTRAINCDIRS  += $(PYMITEINC)
+EXTRAINCDIRS  += $(HWDEFSINC)
 
 # Generate intermediate code
 gencode: ${OUTDIR}/pmlib_img.c ${OUTDIR}/pmlib_nat.c ${OUTDIR}/pmlibusr_img.c ${OUTDIR}/pmlibusr_nat.c ${OUTDIR}/pmfeatures.h 
@@ -213,9 +213,6 @@ ${OUTDIR}/pmlib_img.c ${OUTDIR}/pmlib_nat.c ${OUTDIR}/pmlibusr_img.c ${OUTDIR}/p
 	@$(PYTHON) $(PYMITETOOLS)/pmGenPmFeatures.py $(PYMITEPLAT)/pmfeatures.py > $(OUTDIR)/pmfeatures.h
 	@$(PYTHON) $(PYMITETOOLS)/pmImgCreator.py -f $(PYMITEPLAT)/pmfeatures.py -c -u -o $(OUTDIR)/pmlibusr_img.c --native-file=$(OUTDIR)/pmlibusr_nat.c $(FLIGHTPLANS)/test.py
 EXTRAINCDIRS += ${foreach MOD, ${MODULES} ${PYMODULES}, $(OPMODULEDIR)/${MOD}/inc} ${OPMODULEDIR}/System/inc
-=======
-EXTRAINCDIRS  += $(HWDEFSINC)
->>>>>>> next
 
 # List any extra directories to look for library files here.
 # Also add directories where the linker should search for
diff --git a/flight/Revolution/System/revolution.c b/flight/Revolution/System/revolution.c
index ff634921e..54f98ca03 100644
--- a/flight/Revolution/System/revolution.c
+++ b/flight/Revolution/System/revolution.c
@@ -109,10 +109,10 @@ int main()
 	vTaskStartScheduler();
 
 	/* If all is well we will never reach here as the scheduler will now be running. */
-	/* Do some indication to user that something bad just happened */
-	PIOS_LED_Off(LED1); \
+	/* Do some PIOS_LED_HEARTBEAT to user that something bad just happened */
+	PIOS_LED_Off(PIOS_LED_HEARTBEAT); \
 	for(;;) { \
-		PIOS_LED_Toggle(LED1); \
+		PIOS_LED_Toggle(PIOS_LED_HEARTBEAT); \
 		PIOS_DELAY_WaitmS(100); \
 	};