contributions
conflict res