QBurst Interview Question

How do you resolve git merge conflict issue?