Tentando remover ELVIS do repositório
Merge remote-tracking branch 'origin'

Conflicts:
	ELVIS/ELVIS