Has the UN ever had to intervene in any conflict involving Germany?

Yes, when Germany entered in a conflict with the United Kingdom in 1985 because of the german SEI (System for Economical Issues). The trading between them stopped completely. The UN intervened a year later.