Did some quick bootstrapping
Fixed conflict. Did some quick bootstrapping