after phase
conflict resolved