merged server and server_rest