Bashrc update for not breaking sftp
fixed merging problems