https urls
resolved merge conflic