edit ts.txt from Trees/markpro
edit conflict