diff --git a/slsReceiverSoftware/include/circularFifo.h b/slsReceiverSoftware/include/circularFifo.h
index 6f779aafc..733b0800d 100644
--- a/slsReceiverSoftware/include/circularFifo.h
+++ b/slsReceiverSoftware/include/circularFifo.h
@@ -78,7 +78,6 @@ int CircularFifo<Element>::getSemValue()
 template<typename Element>
 bool CircularFifo<Element>::push(Element*& item_)
 {
-
    int nextTail = increment(tail);
    if(nextTail != head)
    {
@@ -87,7 +86,6 @@ bool CircularFifo<Element>::push(Element*& item_)
       sem_post(&free_mutex);
       return true;
    }
-
    // queue was full
    return false;
 }
diff --git a/slsReceiverSoftware/include/receiver_defs.h b/slsReceiverSoftware/include/receiver_defs.h
index 0a4bda66b..32aa52712 100755
--- a/slsReceiverSoftware/include/receiver_defs.h
+++ b/slsReceiverSoftware/include/receiver_defs.h
@@ -90,7 +90,7 @@
 
 #define JCTB_FIFO_SIZE						2500 //cannot be less than max jobs per thread = 1000
 /*#define MOENCH_ALIGNED_FRAME_SIZE			65536*/
-<<<<<<< HEAD
+//<<<<<<< HEAD
 #define JCTB_PACKETS_PER_FRAME			        1
 #define JCTB_ONE_PACKET_SIZE				8224
 #define JCTB_BUFFER_SIZE 				(JCTB_ONE_PACKET_SIZE*40) 	
@@ -99,7 +99,7 @@
 #define JCTB_FRAME_INDEX_MASK			0xFFFFFFFF
 #define JCTB_FRAME_INDEX_OFFSET			6+8
 #define JCTB_PACKET_INDEX_MASK			0xFFFFFFFF
-=======
+//=======
 #define JCTB_PACKETS_PER_FRAME			    50
 #define JCTB_ONE_PACKET_SIZE				8214
 #define JCTB_BUFFER_SIZE 					(MOENCH_ONE_PACKET_SIZE*MOENCH_PACKETS_PER_FRAME)
@@ -108,7 +108,7 @@
 #define JCTB_FRAME_INDEX_MASK				0xFFFFFF00
 #define JCTB_FRAME_INDEX_OFFSET				8
 #define JCTB_PACKET_INDEX_MASK				0xFF
->>>>>>> 8bad1d33fcf4601752bb6722a9eca00aa2cd4ed2
+//>>>>>>> 8bad1d33fcf4601752bb6722a9eca00aa2cd4ed2
 
 #define JCTB_BYTES_PER_ADC		        	(2)
 #define JCTB_PIXELS_IN_ONE_ROW				32