fix navigation bar
resolve confilict