Url bases stored as variables
resolved merge confclit