Merge of bootstrap