Changed TypicalValues to TypicalValue
Fixed merge conflicts