Fix bad merge in civicrm_generated.mysql