fix typo & broken links
remove conflict
conflict resolved