merge conflict resolved
action & state input functionality