Updates to bash file
Merge conflicts