added baseurl config
fixed merge conflict