Update .bashrc
Fix .bashrc merge