Link fixed to new repo name
Merge conflict fixed