UST Interview Question

How can we resolve merge conflicts