Conflict resolved | ScratchStats