CitiusTech interview question

how to resolve merge conflicts in git