Moved boostrap into compatibility
Fixed conflict