messing with nav bar
fix merge conflicts