enhance bashrc
resolve merge conflict