Refactor
Resolvendo conflitos