fixed conflicts with bootstrap