had conflicted
-había discrepado
Past perfect conjugation of conflict. There are other translations for this conjugation.

conflict

Word of the Day
mistletoe