Conflicts:
	features/context.feature
	features/step_definitions/shared_steps.rb