UST interview question

How can we resolve merge conflicts