merge: with lib/stats move