Resolve conflict:
	apps/browser/style/browser.css
	apps/settings/index.html