major bug fix

If the words weren’t inserted in alphabetical order in the tree some
common prefixes weren’t marked as words
conflicts fixed