Load ~/.bash_profile and ~/.bash_aliases in ~/.bashrc
Resolved conflict