Fix some merge errors.