Add Bash() and Inside()
fix conflicts