resolve conflict: clear markpro/ts.txt