merge upstream bootstrap.sh modify