Criando um conflito
Merge branch 'master' of https://github.com/ISF/dotfiles

Resolvendo conflitos

Conflicts:
	teste