add more words
fix confict