fix conflict in __navigation.scss