update trigram
merge