add nav bar and resolve merge conflicts