fixe bootstrap mistakes
fixe the merge