cambio en readme
fixing merge conflict