Pergunta de entrevista da empresa Chatham Financial

How would you handle a GitHub merge conflict