conflict resolution
conflict res