modified readme
resolving conflicts