fixed merge residue from akka-cluster