Updated URLs
fix merge conflict