fixes nav bar after merge