modified bashrc
resolved merge conflict