fixed find_action
fixed merge conflicts