remove bootstrap
fix merge