Pergunta de entrevista da empresa Itlize Global

How can we resolve merge conflicts?