add the bootstrap.sh
fix conflict issue