essence done
conflict resolution