before conflict
conflict resolved