merging to fix issues
fixing merge issues
fixed nav bar merging