Conflicts... how to resolve?

Teammate updated a collection. I am now getting every tab on the collection showing as having a conflict so I can’t get the updates that he’s posted.
I see no obvious direction to resolve said conflicts. And I’m really beginning to hate this new interface. Definitely not a good design decision, IMO.

It means you have changes that the new updated request doesn’t , have so you can resolve the conflict as:

You can close and open all the request again or overwrite the conflict with what you have currently . It is a good practice to create a fork and work on that than entire team working on the same collection

So my only options are to delete my edits or overwrite those from my teammates?
There’s no ability to merge?