diff --git a/prog/weaver/main.go b/prog/weaver/main.go
index f54eb5fb..fd364aa4 100644
--- a/prog/weaver/main.go
+++ b/prog/weaver/main.go
@@ -332,15 +332,7 @@ func main() {
 		dockerVersion = dockerCli.DockerVersion()
 	}
 
-<<<<<<< HEAD
-	network := ""
-	if bridgeConfig.AWSVPC {
-		network = "awsvpc"
-	}
-	checkForUpdates(dockerVersion, network)
-=======
 	checkForUpdates(dockerVersion, router)
->>>>>>> origin/1.9
 
 	observeContainers := func(o docker.ContainerObserver) {
 		if dockerCli != nil {