line added in primo.txt
altrofile aggiunto sulla branch nuova
linea aggiunta in altrofile
Create pippo
aggiunto file orcocan
Merge branch 'nuovoRamo'
Merge branch 'alcommit7'
line added under alcommit7, expect to conflict with master
Merge branch 'alcommit7'

Solved conflicts: 	primo.txt
by removing the line from alcommit7