Conflict +commentaires

Read the f*cking description