simulating conflict.
Merge pull request #10 from Vivek-Tomar/git-conflict-A

simulating conflict.