working on issue
remove conflicts
Merge pull request #313 from vaibhavcisin274/anshul

Anshul