Fixed url generation
Fixed merge conflict