fixed navbar
merge