Question d’entretien chez UST

How can we resolve merge conflicts