commit no README
conflito resolvido