modified navbar
resolved conflict