diff --git a/core/pom.xml b/core/pom.xml
index 2a81f6df289c0..6e3781f2bb0c6 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -21,7 +21,11 @@
   <parent>
     <groupId>org.apache.spark</groupId>
     <artifactId>spark-parent</artifactId>
+<<<<<<< HEAD
     <version>1.2.0-SNAPSHOT</version>
+=======
+    <version>1.1.0-SNAPSHOT</version>
+>>>>>>> modified the code base on comment in https://github.com/tdas/spark/pull/10
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/python/pyspark/streaming/__init__.py b/python/pyspark/streaming/__init__.py
index 719592912e80c..e69de29bb2d1d 100644
--- a/python/pyspark/streaming/__init__.py
+++ b/python/pyspark/streaming/__init__.py
@@ -1 +0,0 @@
-__author__ = 'ktakagiw'