Fixing urls
Merging