add merge solution
add merge solution