fix the urls
resolved conflicts