replaced comboMultiplier -> comboTime
fixed merge conflicts