merge conflicts
merge conflicts
edited nav bar titles