Update defaultnavbar.html

removing conflicts