some new words
resolved the conflict