add picks 31
fix merge