Advice needed - which one of two templates to use for Comware 5/7

[radiognomebbq]

Hello,

I've "inherited" a pre-configured Zabbix 6.4.x, which monitors a number of Comware 5 and 7 network devices. There are L2 and L3 switches, and some routers.
The problem is, all the devices are configured using 2 different templates, and the choice of template is random to the point when 2 identical devices use different templates.

I am trying to figure out, which one of these templates is out-of box (if any), and which is custom?
Which one is newer?
Which one to use for all the devices?

One of these templates has "version" in description, and the other has "template tooling version". Is "version" and "tooling version" the same thing?

Please advice. Thank you in advance.

The templates in question are:

1. HP Comware HH3C SNMPv2
Description: Template Net HP Comware (HH3C) version: 0.15
Overview: hxxp://certifiedgeek.weebly.com/blog/hp-comware-snmp-mib-for-cpu-memory-and-temperature
hxxp://www.h3c.com.hk/products___solutions/technology/system_management/configuration_example/200912/656451_57_0.htm

MIBs used:
HH3C-ENTITY-EXT-MIB
ENTITY-MIB
Known Issues:
description : No temperature sensors. All entities of them return 0 for HH3C-ENTITY-EXT-MIB::hh3cEntityExtTemperature
version : 1910-48 Switch Software Version 5.20.99, Release 1116 Copyright(c)2010-2016 Hewlett Packard Enterprise Development LP
device : HP 1910-48

2. Template Net HP Comware HH3C SNMPv2
Description: Template Net HP Comware (HH3C)
MIBs used:
ENTITY-MIB
HH3C-ENTITY-EXT-MIB

Known Issues:
Description: No temperature sensors. All entities of them return 0 for HH3C-ENTITY-EXT-MIB::hh3cEntityExtTemperature
Version: 1910-48 Switch Software Version 5.20.99, Release 1116 Copyright(c)2010-2016 Hewlett Packard Enterprise Development LP
Device: HP 1910-48

Template tooling version used: 0.34

[cyber]

https://git.zabbix.com/projects/ZBX/repos/zabbix/browse/templates/net/hp_hh3c_snmp?at=refs%2Fheads%2Frelease%2F6.4

Based on Description.. its the second one... probably something is added to first one as there are some links in description, which might explain, what is added....

[radiognomebbq]

Thank you for the recommendation.
When i attempt to import the new template from that git link, it actually tries to merge with first template, "HP Comware HH3C SNMPv2" but fails with a conflict error.

*EDIT*
Nevermind, i moved all the hosts to a newer one of the two, deleted the old one and successfully merged the newer one with the one from GIT. All is working fine now.