removed api: from server
fixed conflict