creating conflict
conflict resolved