Fix links
Fix merge conflict