update on the conflict | ScratchStats