add words in new line
solve merge conflict