removed setNavigationBar
fixed merge