added type inference for addition and conditionals