data_types merge fix