If we don't reduce conflict to mean military conflict, then I think there is definitely some diplomatic issue ongoing.
> Not sure about which step between will be the drop that overflows the bucket.
True, this is kind of the open question, because the EU both needs to be the adult in the room and deescalate, but also can't do compromises with territorial integrity otherwise it has already lost. This will of course have an impact on the "time to forget".
But I don't think if there is a uprising today in the US, Trump and the whole admin is gone next week and they improve their constitution, that the whole issue will just be forgotten. The whole pro-, neutral- or even contra USA debate has been ongoing for decades know. For example the trade deals aren't exactly concordant with EU law (https://en.wikipedia.org/wiki/Max_Schrems#Schrems_I) and the USA has been boycotting multilateral institutions, that the EU wants to have authority. I mean it is new that they openly sabotage the ICJ, but that they have the capability to do that is not.