bashrc chagnes
merge conflicts