Fix up a lost conflict
Fix up a lost conflict


Former-commit-id: 8d8eb865fb502967716a8aa16554e992a474d489
TrimBiggs/libcalico,caseydavenport/libcalico,tomdee/libcalico,alexhersh/libcalico,robbrockbank/libcalico,projectcalico/libnetwork-plugin,TrimBiggs/libnetwork-plugin,djosborne/libcalico,plwhite/libcalico,tomdee/libnetwork-plugin,insequent/libcalico,L-MA/libcalico,projectcalico/libcalico,TrimBiggs/libnetwork-plugin,Symmetric/libcalico