fix the bug of word
do not commit .idea
merge