resolve .bashrc conflicts