commiting for conflict of readme
resolving conflict