diff --git a/afsk/main.c b/afsk/main.c
index 05629dd8..3e6b1924 100644
--- a/afsk/main.c
+++ b/afsk/main.c
@@ -116,11 +116,7 @@ int sock = 0;
 void write_to_buffer(int i, int symbol, int val);
 void write_wave();
 #define SAMPLES (S_RATE / BIT_RATE)
-<<<<<<< HEAD
-#define FRAME_CNT 60// 11 //33 // Add 3 frames to the count
-=======
 #define FRAME_CNT 11//  //33 // Add 3 frames to the count
->>>>>>> 363442c3e93a3058a0bb88473dc4fa192b6425ad
 
 //#define BUF_LEN (FRAME_CNT * (SYNC_BITS + 10 * (8 + 6 * DATA_LEN + 96)) * SAMPLES)
 #define BUF_LEN (FRAME_CNT * (SYNC_BITS + 10 * (HEADER_LEN + RS_FRAMES * (RS_FRAME_LEN + PARITY_LEN))) * SAMPLES)