resolve merge conflicts
bashrc mods
resolve merge conflict