this is my seconde lovely commit
and here, the third commit
commit 5
Revert "commit 5"

This reverts commit edcbb6b962d12a56248a346afa30ef5c17202fe1.
Revert "Revert "commit 5""

This reverts commit 062fa0117c47a4c4ebd53a082a3a0433b5120dd6.
Revert "Revert "Revert "commit 5"""

This reverts commit 06bcb23f7c6135bebcbf10336b8ad661464eb1ee.
Revert "Revert "Revert "Revert "commit 5""""

This reverts commit 0a98fd078bbde3519319649034ea4ff7d7e88d52.
resolvendo tudo

adasdasd
This is a commit, a really happy one!
more and more happy
nova branch 1
Hola... e aí?
brancheando em DEV
xxxxxxxxxxxxxxxxxxxx
sssssssssssssss
!@%#$^&^&*&^*
Revert "!@%#$^&^&*&^*"

This reverts commit b1e402f48d1fdf6c1ad8771a669b18c8eb6a439f.
ai meu saco
Merge branch 'master' of https://github.com/taylor3lewis/test

Conflicts:
	file.txt
	file.txt.rej