nav bar
merge conflicts