add freq and its test
add merge and its test
Merge branch 'sec07'