fixed a merge issue that resulted in a compile-time error from akka-cluster

Small conflict that resulted from #385 being created without the same rebase as #396.