Improve WARP merge conflict handling

[fuzyll]

Version and Platform (required):

• Binary Ninja Version: 5.3.9216-dev, 5.3.9218-dev
• Edition: Ultimate
• OS: macOS
• OS Version: 26.3.1
• CPU Architecture: aarch64

Bug Description:
Under circumstances I am not entirely sure about, merge conflicts on WARP function GUIDs can occur in Enterprise between two users. When they do, it's entirely unclear to the user what they should do to resolve things properly:

Steps To Reproduce:
Not quite sure right now, happened during a RE//verse demo.

Expected Behavior:
I actually think these probably shouldn't be merge conflicts at all and should be resolved automatically? But, I am not entirely sure of how this works under the hood.

Additional Information:
I have both .bndb files, message me.