rename opration & sidebar access
conflict resolved manually