redeeming conflict

>