Update
Resolve conflict of bashrc