spec fix
resolve merge conflict

Conflicts:
	spec/helpers/session_helper.rb