fixing bootstrap
fixed conflict