fix merge conflict
Merge branch 'cluster' of https://github.com/X-Plat/nats into cluster