updates to bashrc
Recommiting conflicted changes