first commit
avances
avances
avances
avances
pulled
conflict
conflict solved
avances
merged