PATH cleanup in bash profile
Merge conflicts