Commits
Dmitrijs Goloscapovs authored d3920ffc83e
........S. [ZBX-24167] fixed template linkage when item prototype collision is found Merge in ZBX/zabbix from feature/ZBX-24167-6.5 to master * commit '3df1dd85d8edc7ed50133b605034a4c5c9b7e2f0': .......... [ZBX-24167] added changelog ........S. [ZBX-24167] fixed message ........S. [ZBX-24167] fixed various things ........S. [ZBX-24167] fixed query ........S. [ZBX-24167] fixed template linkage by Server when item prototype collision is found (cherry picked from commit 60999958829d9530d6f72d72cb6000aab34ba0e6)