Fixed syntax error in bash_profile.
Solved some merge conflicts