Fixed links
Fixed merge conflict #1329