merge code

add new action