edit ts.txt from trees clone
edit ts.txt from Trees/markpro
edit conflict
edit ts.txt from clone/Trees/markpro
resolve conflict: clear markpro/ts.txt
resolve conflict: clear markpro/ts.txt
Merge commit 'af3c9555f5a2e5a297d3dcfae7303289218a8af3'
resolve conflict and clean ts.txt