conflict aborted