diff --git a/python/pyspark/streaming/context.py b/python/pyspark/streaming/context.py
index a953fe382259c..1e284b58941c4 100644
--- a/python/pyspark/streaming/context.py
+++ b/python/pyspark/streaming/context.py
@@ -17,11 +17,7 @@
 
 import sys
 from signal import signal, SIGTERM, SIGINT
-<<<<<<< HEAD
 
-import time
-=======
->>>>>>> Kill py4j callback server properly
 
 from pyspark.conf import SparkConf
 from pyspark.files import SparkFiles