stats: More descriptive error message with -s and no samples
merge: New -l option, updated docs