Fixed bootstrap

Excuse me for some ambiguity in the commits. This Is due to with solving the conflicts