added nav-bar
resolved merge conflict