diff --git a/python/pyspark/streaming/utils.py b/python/pyspark/streaming/utils.py
index ad1dab0696b1a..9178577743e0b 100644
--- a/python/pyspark/streaming/utils.py
+++ b/python/pyspark/streaming/utils.py
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with