fill in controller actions
fixed conflicts