solve issue 12-jul
remove conflicts 12-jul
Merge pull request #179 from vaibhavcisin274/anshul

Anshul
kamlesh resolve confilict