added conflicts
Merge pull request #2 from gotorajiv/Branch1

added conflicts