fixed typo on navbar
fixed merge issues