repair bashrc
merge