3 files changed, 6 insertions, 12 deletions
diff --git a/WebCore/html/HTMLLinkElement.cpp b/WebCore/html/HTMLLinkElement.cpp
index b3a1c89..5ac39d9 100644
--- a/WebCore/html/HTMLLinkElement.cpp
+++ b/WebCore/html/HTMLLinkElement.cpp
@@ -54,11 +54,10 @@ inline HTMLLinkElement::HTMLLinkElement(const QualifiedName& tagName, Document*
     , m_disabledState(Unset)
     , m_loading(false)
     , m_createdByParser(createdByParser)
-<<<<<<< HEAD
-    , m_timer(this, &HTMLLinkElement::timerFired)
-=======
     , m_shouldProcessAfterAttach(false)
->>>>>>> webkit.org at r61871
+#if PLATFORM(ANDROID) && ENABLE(LINK_PREFETCH)
+    , m_timer(this, &HTMLLinkElement::timerFired)
+#endif
 {
     ASSERT(hasTagName(linkTag));
 }
diff --git a/WebCore/html/HTMLLinkElement.h b/WebCore/html/HTMLLinkElement.h
index f19741f..c8f0ca0 100644
--- a/WebCore/html/HTMLLinkElement.h
+++ b/WebCore/html/HTMLLinkElement.h
@@ -163,11 +163,10 @@ private:
     RelAttribute m_relAttribute;
     bool m_loading;
     bool m_createdByParser;
-<<<<<<< HEAD
-    Timer<HTMLLinkElement> m_timer;
-=======
     bool m_shouldProcessAfterAttach;
->>>>>>> webkit.org at r61871
+#if PLATFORM(ANDROID) && ENABLE(LINK_PREFETCH)
+    Timer<HTMLLinkElement> m_timer;
+#endif
 };
 
 } //namespace
diff --git a/WebCore/html/HTMLTableCellElement.cpp b/WebCore/html/HTMLTableCellElement.cpp
index 3fa8946..e102d0b 100644
--- a/WebCore/html/HTMLTableCellElement.cpp
+++ b/WebCore/html/HTMLTableCellElement.cpp
@@ -99,13 +99,9 @@ void HTMLTableCellElement::parseMappedAttribute(Attribute* attr)
         if (renderer() && renderer()->isTableCell())
             toRenderTableCell(renderer())->updateFromElement();
     } else if (attr->name() == nowrapAttr) {
-<<<<<<< HEAD
 #ifdef ANDROID_LAYOUT
         if (!(document()->frame()) || document()->frame()->settings()->layoutAlgorithm() != Settings::kLayoutSSR)
 #endif
-        // FIXME: What about removing the property when the attribute becomes null?
-=======
->>>>>>> webkit.org at r61871
         if (!attr->isNull())
             addCSSProperty(attr, CSSPropertyWhiteSpace, CSSValueWebkitNowrap);
     } else if (attr->name() == widthAttr) {