logo in navbar
merge