Smart merge - fixed the colours | ScratchStats