Add missing import to urls
fix merge conflict