Modified base url
Resolved merge conflict