attempted to add bootstrap
fixed conflicts