added bootstrap
fixed merged conflict