git conflict
Merge branch 'master' of https://github.com/Mayankkp/istream