add navbar-auto
resolve conflict