fix merge conflict (parse_url)