added new navbar
update CNAME
fixed merge