diff --git a/grpc-build-system.bzl b/grpc-build-system.bzl
index 0ef3a0ea07d69ec18db2c7d8f2df66d1f78e22d9..187cc3e424daaabb2b52d77efc56802f2eb1920d 100644
--- a/grpc-build-system.bzl
+++ b/grpc-build-system.bzl
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Copyright 2016, Google Inc.
 # All rights reserved.
 #