authorization completed
conflict resolved