nav bar added
conflict resolved