calcs/risk/base:

Fixed some merge errors.