BTW, the check_and_fix_conflicts_for_mixed_types_test specifically tests this case now