changed url
fixed merge conflict