add file
add merge_ts_dat
re-comment checking code