fix typos

consensus/consensus_validator.go

@@ -42,7 +42,7 @@ func (consensus *Consensus) IsValidatorMessage(message *msg_pb.Message) bool {
 }
 
 // ProcessMessageValidator dispatches validator's consensus message.
-func (consensus *Consensus) NewProcessMessageValidator(payload []byte) {
+func (consensus *Consensus) ProcessMessageValidator(payload []byte) {
 	message := &msg_pb.Message{}
 	err := protobuf.Unmarshal(payload, message)
 	if err != nil {

node/node_handler.go

@@ -135,7 +135,6 @@ func (node *Node) messageHandler(content []byte, sender string) {
 			utils.GetLogInstance().Info("NET: Leader received message:", "messageCategory", msgCategory)
 			consensusObj.ProcessMessageLeader(msgPayload)
 		} else {
-<<<<<<< HEAD
 			utils.GetLogInstance().Info("NET: Validator received message:", "messageCategory", msgCategory)
 			consensusObj.ProcessMessageValidator(msgPayload)
 			// TODO(minhdoan): add logic to check if the current blockchain is not sync with other consensus