Leidos Interview Question

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