Resolvendo conflitos com as features