work on group tax
remove conflicts 5-jul
again remove conflicts 5-jul
Merge pull request #69 from vaibhavcisin274/anshul

Anshul