some base action
fixed merge conflicts