use navbar-inverse
resolve conflict by accepting --theirs