diff --git a/pubsub/cloud-client/requirements.txt b/pubsub/cloud-client/requirements.txt
index dcffe157c20..5601ca5ea29 100644
--- a/pubsub/cloud-client/requirements.txt
+++ b/pubsub/cloud-client/requirements.txt
@@ -1,6 +1,2 @@
-<<<<<<< HEAD
 google-cloud-pubsub==0.33.0
-=======
-google-cloud-pubsub==0.32.1
 futures==3.1.1; python_version < '3'
->>>>>>> master