modified
resolved conflict of .bashrc