fix issue 29-aug
remove conflicts 29-aug
Merge pull request #323 from vaibhavcisin274/anshul

Anshul