Resolve merge conflict

Conflicts:
	app/assets/stylesheets/menu.css.scss