Added link, removed merge conflict