edit ts.txt from trees clone
edit conflict
edit ts.txt from clone/Trees/markpro