Pregunta de entrevista de Itlize Global

How can we resolve merge conflicts?