fixed .bashrc
merge fixes