TimeFrame now has merge_timeframes function and test.