diff --git a/silecs-communication-cpp/src/silecs-communication/interface/equipment/SilecsPLC.cpp b/silecs-communication-cpp/src/silecs-communication/interface/equipment/SilecsPLC.cpp
index ed0fabb61281af5e88d87e63c95fc483f269bf8a..4db7910b03ee37d53c9196ecf383f540a8ce0de0 100644
--- a/silecs-communication-cpp/src/silecs-communication/interface/equipment/SilecsPLC.cpp
+++ b/silecs-communication-cpp/src/silecs-communication/interface/equipment/SilecsPLC.cpp
@@ -240,11 +240,7 @@ namespace Silecs
 					{
 						if( pDeviceIter->second->hasBlock((*blockIter)->getName()))
 						{
-							LOG(COMM) << "Updating block '" << (*blockIter)->getName() << "' for device '" << pDeviceIter->second->getLabel()<< "'";
-<<<<<<< HEAD
-							//pDeviceIter->second->keepMasterRegisters(pBlock->getName());
-=======
->>>>>>> refs/heads/gsi-1.0.x_centOS7
+							LOG(COMM) << "Updating block '" << (*blockIter)->getName() << "' for device '" << pDeviceIter->second->getLabel()<< "'";
 							pDeviceIter->second->recv((*blockIter)->getName());
 						}
 					}