Editando 1.txt
2.ttxt
editando 2.txt
editing 1txt for develop
Merge branch 'newFeat' into develop
editando 2.txt
editando 2.txt para dev
Merge branch 'newFeat' into develop

Conflicts:
	2.txt