merge
add merge
fix bugs