fix issue with prompt when file conflict occours
Merge pull request #215 from revathskumar/fix-prompt-conflicter

Fix issue with prompt when file conflict occours