The priority will be fixing the dialog resize issue. However, after that's done, I'm practically out of ideas. I took a look on old posts and found this here: Conflict Resolution Plugin - #5 by JackGruber
I'm not entirely sure how useful would it be though, we did have a conversion about it there:
E: I JUST now remembered that adding a notification when a conflict happen was also in the plans. So that's next in line for sure! (I guess? What do you think ?)