remove redundant
merge
typos