add testing for merge
add merge