fix navbar
merge conflict