changed host
fixed conflict