diff --git a/rf60X_protocol.c b/rf60X_protocol.c
index b17e40a482a4211cd6838fcf0a96231eab12545a..38666096fb1afe42b37d3230f22a5ff135a181dd 100644
--- a/rf60X_protocol.c
+++ b/rf60X_protocol.c
@@ -1,6 +1,5 @@
 #include "rf60X_protocol.h"
 
-//...//
 rfUint32 rf60x_protocol_old_pack_payload_msg_to_user_params_packet(rfUint8 *buffer, vector_t *params_list)
 {
     rfUint8 *buf = &buffer[0];
@@ -44,7 +43,6 @@ rf60xB_udp_measure_t rf60xB_protocol_old_unpack_measure_msg_from_packet(rfUint8
 {
     rfUint16 i=0;
     rfUint8 *p = buffer;
-<<<<<<< HEAD
 
     for(i=0; i<100; ++i){
         msg->rf60xBValArray[i].measure = get_rfUint16_from_packet(&p, kEndianessLittle);
@@ -60,23 +58,6 @@ rf60xB_udp_measure_t rf60xB_protocol_old_unpack_measure_msg_from_packet(rfUint8
     msg->packCount = get_rfUint8_from_packet(&p);
     msg->packetControlSumm=get_rfUint8_from_packet(&p);
 
-=======
-
-    for(i=0; i<100; ++i){
-        msg->rf60xBValArray[i].measure = get_rfUint16_from_packet(&p, kEndianessLittle);
-        msg->rf60xBValArray[i].exposition=get_rfUint16_from_packet(&p, kEndianessLittle);
-        msg->rf60xBValArray[i].status = get_rfUint8_from_packet(&p);
-    }
-
-    msg->reserved=get_rfUint16_from_packet(&p, kEndianessLittle);
-    msg->reserved2=get_rfUint16_from_packet(&p, kEndianessLittle);
-    msg->deviceSerial = get_rfUint16_from_packet(&p, kEndianessLittle);
-    msg->deviceBaseDistance = get_rfUint16_from_packet(&p, kEndianessLittle);
-    msg->deviceMeasureRange = get_rfUint16_from_packet(&p, kEndianessLittle);
-    msg->packCount = get_rfUint8_from_packet(&p);
-    msg->packetControlSumm=get_rfUint8_from_packet(&p);
-
->>>>>>> a648698a9720f03ef023ad68f7fa956a0c88da82
     return *msg;
 }