allow reporting of first sample
Fix merge conflicts