hasFailed() fix
delay option
conflict resolve