QBurst interview question

How do you resolve git merge conflict issue?