Fixed link
Fixed merge conflict