Readme
Resolver conflict