3 files changed, 3 insertions, 16 deletions
diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
index 233b798..a0ddede 100644
--- a/Source/WebCore/dom/Document.cpp
+++ b/Source/WebCore/dom/Document.cpp
@@ -394,14 +394,10 @@ Document::Document(Frame* frame, const KURL& url, bool isXHTML, bool isHTML)
     : ContainerNode(0)
     , m_compatibilityMode(NoQuirksMode)
     , m_compatibilityModeLocked(false)
-<<<<<<< HEAD
-    , m_domTreeVersion(0)
+    , m_domTreeVersion(++s_globalTreeVersion)
 #ifdef ANDROID_STYLE_VERSION
     , m_styleVersion(0)
 #endif
-=======
-    , m_domTreeVersion(++s_globalTreeVersion)
->>>>>>> webkit.org at r82507
     , m_styleSheets(StyleSheetList::create(this))
     , m_readyState(Complete)
     , m_styleRecalcTimer(this, &Document::styleRecalcTimerFired)
diff --git a/Source/WebCore/dom/Document.h b/Source/WebCore/dom/Document.h
index c9a1b55..11c595a 100644
--- a/Source/WebCore/dom/Document.h
+++ b/Source/WebCore/dom/Document.h
@@ -1253,15 +1253,11 @@ private:
     RefPtr<Node> m_activeNode;
     mutable RefPtr<Element> m_documentElement;
 
-<<<<<<< HEAD
-    unsigned m_domTreeVersion;
+    uint64_t m_domTreeVersion;
+    static uint64_t s_globalTreeVersion;
 #ifdef ANDROID_STYLE_VERSION
     unsigned m_styleVersion;
 #endif
-=======
-    uint64_t m_domTreeVersion;
-    static uint64_t s_globalTreeVersion;
->>>>>>> webkit.org at r82507
     
     HashSet<NodeIterator*> m_nodeIterators;
     HashSet<Range*> m_ranges;
diff --git a/Source/WebCore/dom/StyleElement.cpp b/Source/WebCore/dom/StyleElement.cpp
index e9d035d..9892ed7 100644
--- a/Source/WebCore/dom/StyleElement.cpp
+++ b/Source/WebCore/dom/StyleElement.cpp
@@ -103,15 +103,10 @@ void StyleElement::process(Element* e)
     for (Node* c = e->firstChild(); c; c = c->nextSibling()) {
         if (isValidStyleChild(c)) {
             unsigned length = c->nodeValue().length();
-<<<<<<< HEAD
-            if (length > std::numeric_limits<unsigned>::max() - resultLength)
-                CRASH();
-=======
             if (length > std::numeric_limits<unsigned>::max() - resultLength) {
                 createSheet(e, m_startLineNumber, "");
                 return;
             }
->>>>>>> webkit.org at r82507
             resultLength += length;
         }
     }