Changed URL
Fixed merge conflict