Pull conflits are removed
File1 changed
test for stash cmd
Merge branch 'testing' of https://github.com/amolplay/First-Repository into testing