Index: channels/chan_zap.c
===================================================================
--- channels/chan_zap.c	(revision 10707)
+++ channels/chan_zap.c	(working copy)
@@ -107,7 +107,6 @@
 #define SMDI_MD_WAIT_TIMEOUT 1500 /* 1.5 seconds */
 #endif
 
-<<<<<<< .working
 #ifdef AST_JB
 #include "asterisk/abstract_jb.h"
 /* Global jitterbuffer configuration - by default, jb is disabled */
@@ -125,6 +124,7 @@
 #ifndef ZT_SIG_HARDHDLC
 #error "Your zaptel is too old.  please update"
 #endif
+#endif
 
 #ifndef ZT_TONEDETECT
 /* Work around older code with no tone detect */
Index: Makefile
===================================================================
--- Makefile	(revision 10707)
+++ Makefile	(working copy)
@@ -85,7 +85,7 @@
 TRACE_FRAMES = #-DTRACE_FRAMES
 
 # Uncomment next one to enable the asterisk generic jitterbuffer
-GENERIC_JB = #-DAST_JB
+GENERIC_JB = -DAST_JB
 
 # Uncomment next one to enable malloc debugging
 # You can view malloc debugging with: