fix tmerge