Second teste
changes to pippo.txt
Added pippo2.txt
Creating conflict, master side
Creating conflict, my_branch side
Fixed the conflicts