Fix merge conflict error in test_ipv6_bgp_scale.py#23118

StormLiangMS merged 1 commit intosonic-net:mastersonic-net/sonic-mgmt:masterfrom

weiguo-nvidia:fix_icmp_typeweiguo-nvidia/sonic-mgmt:fix_icmp_typeCopy head branch name to clipboard