remove target='_blank'
add missing link
solve merge conflict