client to server
fixed conflict
almost working