Changed the .bash files
Fixed merge conflict in .bashrc