Update link to download
Fix conflicts