changed url
fixed conflict