Ours and Theirs are confusing, add more info everywhere it's used in GUI

Everytime I have a conflict in git and I need to resolve it by choosing "Take Ours" or "Take Theirs" - I get confused
I roughly remember that if I do merge - Ours is mine, Theirs is remote

If it's rebase - it's reverse... when applying stash - it's something else...

So thinking about this is hard.. and I am never sure I got it correctly
What I do in the end - I right click file, go to commit log... look at commits and then select file and "Save as after" and Stage to resolve the conflict so I really know which commit is "ours" and which commit is "theirs"

My suggestion is:

everywhere where in UI you write "Take Ours" and "Take Theirs" - do add more info i.e.

Take Ours (<hash> <branch> <author> <message>)
Take Theirs (<hash> <branch> <author> <message>)

It's especially helpful with non tech people (like artists)
Explaining to them insanity about "ours" and "theirs" is pretty much impossible