merge master-server