solving conflicts | ScratchStats