Accenture interview question

How to resolve git conflicts