replace navbar-form class
fix merge conflicts