fixing rebase

fix rebasing conflicts

change server to broker

change server to broker