diff --git a/python/pyspark/streaming/context.py b/python/pyspark/streaming/context.py
index 0e32b80cbee31..a953fe382259c 100644
--- a/python/pyspark/streaming/context.py
+++ b/python/pyspark/streaming/context.py
@@ -17,8 +17,11 @@
 
 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