add currency exchange
remove conflicts
change vendor name
Merge pull request #274 from vaibhavcisin274/anshul

Anshul