Fixing build issues with url genration
Fixing merge conflict