fixed navbar conflicts
Merge pull request #39 from s-loar/Lienha

fixed navbar conflicts