add trie tree related
resovle conflict