has been conflicting
-ha estado discrepando
Present perfect progressive he/she conjugation of conflict.

conflict

Word of the Day
chestnut