create new action to user
solve merge conflicts