diff --git a/.gitignore b/.gitignore
index 9a2760eb..1491f4a1 100755
--- a/.gitignore
+++ b/.gitignore
@@ -45,7 +45,10 @@ paper.aux
 # Test Reports
 TEST*.xml
 test_warehouses
+<<<<<<< HEAD
+=======
 
 # Ensime files for emacs
+>>>>>>> amplab
 .ensime
 .ensime_lucene
diff --git a/src/main/scala/shark/execution/serialization/XmlSerializer.scala b/src/main/scala/shark/execution/serialization/XmlSerializer.scala
index 052366b2..946c574d 100644
--- a/src/main/scala/shark/execution/serialization/XmlSerializer.scala
+++ b/src/main/scala/shark/execution/serialization/XmlSerializer.scala
@@ -69,14 +69,11 @@ object XmlSerializer {
         new ByteArrayInputStream(bytes.slice(1, bytes.size))
       }
 
-    // Occasionally an object inspector is created from the decoding.
-    // Need to put a lock on the process.
-    val ret = SharkEnvSlave.objectInspectorLock.synchronized {
-      val d: XMLDecoder = new XMLDecoder(decodedStream, null, null, cl)
-      val ret = d.readObject()
-      d.close()
-      ret
-    }
+    // 
+    // no lock needed because of the hive bug fix for concurrent
+    val d: XMLDecoder = new XMLDecoder(decodedStream, null, null, cl)
+    val ret = d.readObject()
+    d.close()
     ret.asInstanceOf[T]
   }
 }