Pergunta de entrevista da empresa Leidos

Explain git branching and merging. What is a merge conflict?