fixed merge confilict

examples/bgp/main.go

examples/bgp/main_ipv4.go

examples/bgp/main_ipv6.go

examples/bmp/main_bmp.go

examples/netlink/main.go

protocols/bgp/server/bmp_router_test.go

protocols/bgp/server/fsm_test.go

protocols/bgp/server/update_sender_test.go

routingtable/locRIB/loc_rib.go

routingtable/locRIB/loc_rib_test.go

routingtable/locRIB/registry.go

routingtable/locRIB/registry_test.go