Change bash_profile a little
Fix merge conflict