update urls
fix conflicts