Conflicts:
	features/domains/default.xml
	features/evince.feature
	features/step_definitions/checks.rb
	features/step_definitions/common_steps.rb
	features/step_definitions/tor.rb
	features/step_definitions/unsafe_browser.rb
	features/step_definitions/usb.rb
	features/unsafe_browser.feature