conflict settlement
aa