fix_conflicting_types.patch
