CitiusTech Interview Question

how to resolve merge conflicts in git