resolved some merge conflicts in URLUtil