added to readme
Resolve the conflict