diff --git a/hardware.h b/hardware.h
index 1ac43e7..3549505 100644
--- a/hardware.h
+++ b/hardware.h
@@ -30,7 +30,6 @@
 #define SPIRAM_SIZE	65536
 
 // "tape" storage...
-<<<<<<< HEAD
 #define SD_CS		PF_3
 //#define SD_CS		PE_0
 #define SD_SPI		1