Added bootstrap version
Merge conflict solved