Update defaultnavbar.html

removing conflict