fixed replace_words
merge