Vodafone interview question

How do we resolve a merge conflict on git ?