navbar added
fixing merge conflict in stylesheet