correctly resolve conflict with PR 505, 506
correctly resolve conflict with PR 505, 506

kavoj/cli,EngineerBetter/cli,Zouuup/cli,evanfarrar/cli,markstgodard/cli,18F/cli,EngineerBetter/cli,kavoj/cli,fujitsu-cf/cli,mcintyred/cli,cf-routing/cli,markstgodard/cli,ReachingOut/cli,cgvarela/cli,EngineerBetter/cli,ofer43211/cli,cgvarela/cli,kavoj/cli,hyenaspots/cli,kavoj/cli,simonleung8/cli,carnell69/cli,pishro-cc/cli,ReachingOut/cli,ofer43211/cli,saravana76/cli,saurabhguptasg/cli,cf-routing/cli,SrinivasChilveri/cli,EngineerBetter/cli,saurabhguptasg/cli,markstgodard/cli,hyenaspots/cli,pishro-cc/cli,simonleung8/cli,saurabhguptasg/cli,mcintyred/cli,carnell69/cli,evanfarrar/cli,cf-routing/cli,evanfarrar/cli,saravana76/cli,ofer43211/cli,hyenaspots/cli,saravana76/cli,Zouuup/cli,carnell69/cli,fujitsu-cf/cli,simonleung8/cli,fujitsu-cf/cli,pishro-cc/cli,18F/cli,mcowger/cli,SrinivasChilveri/cli,TomG713/cli,SrinivasChilveri/cli,TomG713/cli,18F/cli,saravana76/cli,carnell69/cli,mcintyred/cli,mcowger/cli,mcowger/cli,ofer43211/cli,ReachingOut/cli,TomG713/cli,Zouuup/cli,markstgodard/cli,mcintyred/cli,TomG713/cli,ReachingOut/cli,SrinivasChilveri/cli,saurabhguptasg/cli,evanfarrar/cli,hyenaspots/cli,mcowger/cli,cgvarela/cli,cgvarela/cli,pishro-cc/cli,Zouuup/cli,cf-routing/cli,18F/cli