bashrc update
merge conflict