rake merge
add merge