Merge branch 'master', remote-tracking branch 'origin'
pulled from origin/master and solved merging conflicts.
corrcted bashrc