Resolvendo conflito dos forks do Tanure/Antonio