Changed repo URLs
Fixed merge conflict