fixed navbar issue
merge