Added bootstrap
Fixed conflict