diff --git a/.circleci/Dockerfile b/.circleci/Dockerfile
index 63e353f1877..c19d2ba60b0 100644
--- a/.circleci/Dockerfile
+++ b/.circleci/Dockerfile
@@ -19,11 +19,7 @@ RUN sudo apt-get update && \
     clang-6.0 clang-format-6.0 rsync ninja-build
 
 # ~100M, depends on g++, zlib1g-dev, bash-completions
-<<<<<<< HEAD
-RUN curl -Lo /tmp/bazel.deb https://github.com/bazelbuild/bazel/releases/download/0.15.2/bazel_0.15.2-linux-x86_64.deb && \
-=======
 RUN curl -Lo /tmp/bazel.deb https://github.com/bazelbuild/bazel/releases/download/0.18.0/bazel_0.18.0-linux-x86_64.deb && \
->>>>>>> upstream/release-1.1
     sudo dpkg -i /tmp/bazel.deb && rm /tmp/bazel.deb
 
 
diff --git a/.circleci/Makefile b/.circleci/Makefile
index cdcf618f25b..b0232c3f9e9 100644
--- a/.circleci/Makefile
+++ b/.circleci/Makefile
@@ -2,11 +2,7 @@ HUB ?=
 PROJECT ?= istio
 
 # Using same naming convention as istio/istio
-<<<<<<< HEAD
-VERSION ?= go1.10-bazel0.15-clang6.0
-=======
 VERSION ?= go1.10-bazel0.18-clang6.0
->>>>>>> upstream/release-1.1
 IMG ?= ci
 
 # Build a local image, can be used for testing with circleci command line.
diff --git a/Makefile b/Makefile
index 6ccc580258e..bd73da21cb0 100644
--- a/Makefile
+++ b/Makefile
@@ -57,7 +57,6 @@ test_tsan:
 
 check:
 	@script/check-license-headers
-	@script/check-repositories
 	@script/check-style
 
 artifacts: build
diff --git a/WORKSPACE b/WORKSPACE
index 89342046ac8..ea6783ac9c9 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -36,13 +36,11 @@ bind(
 #
 # Determine SHA256 `wget https://github.com/envoyproxy/envoy/archive/COMMIT.tar.gz && sha256sum COMMIT.tar.gz`
 ENVOY_SHA = "b3be5713f2100ab5c40316e73ce34581245bd26a"
-ENVOY_SHA256 = "79629284ae143d66b873c08883dc6382fac2e8ed45f6f3521f7e7282b6650216"
 
 http_archive(
     name = "envoy",
     strip_prefix = "envoy-" + ENVOY_SHA,
-    url = "https://github.com/envoyproxy/envoy/archive/" + ENVOY_SHA + ".tar.gz",
-    sha256 = ENVOY_SHA256,
+    url = "https://github.com/istio/envoy/archive/" + ENVOY_SHA + ".tar.gz",
 )
 
 load("@envoy//bazel:repositories.bzl", "envoy_dependencies")
@@ -60,11 +58,9 @@ go_register_toolchains()
 
 # Nov 28, 2017 (bazel 0.8.0 support)
 RULES_PROTOBUF_SHA = "563b674a2ce6650d459732932ea2bc98c9c9a9bf"
-RULES_PROTOBUF_SHA256 = "338e0d65cd709c6a6f9b5702466e641d536479be8b564d1e12a5d1de22a5cff6"
 
 http_archive(
     name = "org_pubref_rules_protobuf",
     strip_prefix = "rules_protobuf-" + RULES_PROTOBUF_SHA,
     url = "https://github.com/pubref/rules_protobuf/archive/" + RULES_PROTOBUF_SHA + ".tar.gz",
-    sha256 = RULES_PROTOBUF_SHA256,
 )