String resolveTypeConflict(String type1, String type2) {
        Map<String, Map<String, String>> typeConflictResolution = loadTypeConflictResolution();
        return resolveTypeConflict(type1, type2, typeConflictResolution);
    }
Resolves a type conflict between two Vespa field types.
Uses the type conflict resolution rules defined in the type_conflict_resolution.yml file.
If no resolution is found, returns null.

@param type1 First Vespa field type
@param type2 Second Vespa field type
@return The resolved type, or null if no resolution is found
integration/logstash-plugins/logstash-output-vespa/src/main/java/org/logstashplugins/VespaAppPackageWriter.java