diff --git a/Transceiver52M/radioInterface.cpp b/Transceiver52M/radioInterface.cpp
index 531a0dd..2b56f9a 100644
--- a/Transceiver52M/radioInterface.cpp
+++ b/Transceiver52M/radioInterface.cpp
@@ -22,7 +22,6 @@
 
 */
 
-//#define NDEBUG
 #include "radioInterface.h"
 #include <Logger.h>
 
@@ -151,7 +150,6 @@
   short *shortItr = shortVector;
   while (itr < newVector.end()) {
     *itr++ = Complex<float>(*shortItr,*(shortItr+1));
-    //LOG(DEBUG) << (*(itr-1));
     shortItr += 2;
   }
 
@@ -169,7 +167,10 @@
 					  INCHUNK*samplesPerSymbol,
 					  &underrun,
 					  writeTimestamp); 
+<<<<<<< HEAD
   //LOG(DEBUG) << "writeTimestamp: " << writeTimestamp << ", samplesWritten: " << samplesWritten;
+=======
+>>>>>>> 957b9c5... transceiver: remove extraneous comments
    
   writeTimestamp += (TIMESTAMP) samplesWritten;