fixed BA_cascade.py merge conflict
fixed merge confict in SI_model.py