changed url
resolved merge conflicts