ummmm just tried this just now and I love love love love it.
Specifically, love that it immediately it tells you that there’s a conflict and tells you the file it’s having issues with. Love how it’s literally a case of ‘clicking the one you want’ to resolve the conflict. And love how that’s just it! No extra complication.
Thanks for this feature!! 