Fixed all the conflicts and added a distance message to the message_tx protocol