"updated namenode, datanode, client communication"
conflict solved