Merge baseurl changes