merge mainServer