fixed merge conflicts in urls