add more samples and fix merge