added new url
fixed static issue
resolved merge conflict