fare fixing
Fix merge conflicts
foundation topbar scss activation