2 files changed, 5 insertions, 18 deletions
diff --git a/Source/WebCore/html/HTMLMediaElement.cpp b/Source/WebCore/html/HTMLMediaElement.cpp
index a2506d0..ad0fdef 100644
--- a/Source/WebCore/html/HTMLMediaElement.cpp
+++ b/Source/WebCore/html/HTMLMediaElement.cpp
@@ -171,14 +171,12 @@ HTMLMediaElement::HTMLMediaElement(const QualifiedName& tagName, Document* docum
     LOG(Media, "HTMLMediaElement::HTMLMediaElement");
     document->registerForDocumentActivationCallbacks(this);
     document->registerForMediaVolumeCallbacks(this);
-<<<<<<< HEAD
+    document->registerForPrivateBrowsingStateChangedCallbacks(this);
 #if PLATFORM(ANDROID) && ENABLE(TOUCH_EVENTS)
     // Enable the Media Element to listen to all the touch events
     document->addListenerTypeIfNeeded(eventNames().touchstartEvent);
 #endif
-=======
-    document->registerForPrivateBrowsingStateChangedCallbacks(this);
->>>>>>> WebKit at r80534
+
 }
 
 HTMLMediaElement::~HTMLMediaElement()
diff --git a/Source/WebCore/html/parser/HTMLDocumentParser.cpp b/Source/WebCore/html/parser/HTMLDocumentParser.cpp
index 843df45..e79a97a 100644
--- a/Source/WebCore/html/parser/HTMLDocumentParser.cpp
+++ b/Source/WebCore/html/parser/HTMLDocumentParser.cpp
@@ -341,25 +341,14 @@ void HTMLDocumentParser::append(const SegmentedString& source)
     if (m_preloadScanner)
         m_preloadScanner->appendToEnd(source);
 
-<<<<<<< HEAD
-        if (m_writeNestingLevel > 1) {
-            // We've gotten data off the network in a nested write.
-            // We don't want to consume any more of the input stream now.  Do
-            // not worry.  We'll consume this data in a less-nested write().
-#ifdef ANDROID_INSTRUMENT
-            android::TimeCounter::record(android::TimeCounter::ParsingTimeCounter, __FUNCTION__);
-#endif
-            return;
-        }
-
-        pumpTokenizerIfPossible(AllowYield);
-=======
     if (inPumpSession()) {
         // We've gotten data off the network in a nested write.
         // We don't want to consume any more of the input stream now.  Do
         // not worry.  We'll consume this data in a less-nested write().
+#ifdef ANDROID_INSTRUMENT
+        android::TimeCounter::record(android::TimeCounter::ParsingTimeCounter, __FUNCTION__);
+#endif
         return;
->>>>>>> WebKit at r80534
     }
 
     pumpTokenizerIfPossible(AllowYield);