resolved conflict in session_controller