Fix the conflict
Fix the conflict

omesquita/curso-php-free,xatanais/curso-php-free,leandrobitencourt/curso-php-free,marcelobiao/curso-php-free,marcelobiao/curso-php-free,jonataa/curso-php-free,jonataa/curso-php-free