solve content conflict when merge #4 from linkerlin/master
fix word connect with '-' split error #3 by yaochitc