reset bootstrap, start from scratch
fix merge problems