diff --git a/content/html/style/src/nsHTMLStyleSheet.cpp b/content/html/style/src/nsHTMLStyleSheet.cpp
index ed795211afe7..f970317ccbe3 100644
--- a/content/html/style/src/nsHTMLStyleSheet.cpp
+++ b/content/html/style/src/nsHTMLStyleSheet.cpp
@@ -491,35 +491,9 @@ protected:
                              nsIStyleContext* aStyleContext,
                              nsAbsoluteItems& aAbsoluteItems,
                              nsFrameItems&    aFrameItems,
-<<<<<<< nsHTMLStyleSheet.cpp
-               PRBool&      haltProcessing);
-=======
                              nsAbsoluteItems& aFixedItems,
-                             PRBool&          haltProcessing);
->>>>>>> 3.141
+                             PRBool&          aHaltProcessing);
 
-<<<<<<< nsHTMLStyleSheet.cpp
-  nsresult ConstructTreeFrame(nsIPresContext*   aPresContext,
-                               nsIContent*      aContent,
-                               nsIFrame*        aParent,
-                               nsIStyleContext* aStyleContext,
-                               nsAbsoluteItems& aAboluteItems,
-                               nsIFrame*&       aNewFrame);
-
-  nsresult ConstructTreeBodyFrame(nsIPresContext*       aPresContext,
-                                       nsIContent*      aContent,
-                                       nsIFrame*        aParent,
-                                       nsIStyleContext* aStyleContext,
-                                       nsIFrame*&       aNewScrollFrame,
-                                       nsIFrame*&       aNewFrame);
-
-  nsresult ConstructTreeCellFrame(nsIPresContext*   aPresContext,
-                                   nsIContent*      aContent,
-                                   nsIFrame*        aParentFrame,
-                                   nsIStyleContext* aStyleContext,
-                                   nsAbsoluteItems& aAbsoluteItems,
-                                   nsIFrame*&       aNewFrame);
-=======
   nsresult ConstructTreeFrame(nsIPresContext*  aPresContext,
                               nsIContent*      aContent,
                               nsIFrame*        aParent,
diff --git a/layout/html/style/src/nsHTMLStyleSheet.cpp b/layout/html/style/src/nsHTMLStyleSheet.cpp
index ed795211afe7..f970317ccbe3 100644
--- a/layout/html/style/src/nsHTMLStyleSheet.cpp
+++ b/layout/html/style/src/nsHTMLStyleSheet.cpp
@@ -491,35 +491,9 @@ protected:
                              nsIStyleContext* aStyleContext,
                              nsAbsoluteItems& aAbsoluteItems,
                              nsFrameItems&    aFrameItems,
-<<<<<<< nsHTMLStyleSheet.cpp
-               PRBool&      haltProcessing);
-=======
                              nsAbsoluteItems& aFixedItems,
-                             PRBool&          haltProcessing);
->>>>>>> 3.141
+                             PRBool&          aHaltProcessing);
 
-<<<<<<< nsHTMLStyleSheet.cpp
-  nsresult ConstructTreeFrame(nsIPresContext*   aPresContext,
-                               nsIContent*      aContent,
-                               nsIFrame*        aParent,
-                               nsIStyleContext* aStyleContext,
-                               nsAbsoluteItems& aAboluteItems,
-                               nsIFrame*&       aNewFrame);
-
-  nsresult ConstructTreeBodyFrame(nsIPresContext*       aPresContext,
-                                       nsIContent*      aContent,
-                                       nsIFrame*        aParent,
-                                       nsIStyleContext* aStyleContext,
-                                       nsIFrame*&       aNewScrollFrame,
-                                       nsIFrame*&       aNewFrame);
-
-  nsresult ConstructTreeCellFrame(nsIPresContext*   aPresContext,
-                                   nsIContent*      aContent,
-                                   nsIFrame*        aParentFrame,
-                                   nsIStyleContext* aStyleContext,
-                                   nsAbsoluteItems& aAbsoluteItems,
-                                   nsIFrame*&       aNewFrame);
-=======
   nsresult ConstructTreeFrame(nsIPresContext*  aPresContext,
                               nsIContent*      aContent,
                               nsIFrame*        aParent,
diff --git a/layout/style/nsHTMLStyleSheet.cpp b/layout/style/nsHTMLStyleSheet.cpp
index ed795211afe7..f970317ccbe3 100644
--- a/layout/style/nsHTMLStyleSheet.cpp
+++ b/layout/style/nsHTMLStyleSheet.cpp
@@ -491,35 +491,9 @@ protected:
                              nsIStyleContext* aStyleContext,
                              nsAbsoluteItems& aAbsoluteItems,
                              nsFrameItems&    aFrameItems,
-<<<<<<< nsHTMLStyleSheet.cpp
-               PRBool&      haltProcessing);
-=======
                              nsAbsoluteItems& aFixedItems,
-                             PRBool&          haltProcessing);
->>>>>>> 3.141
+                             PRBool&          aHaltProcessing);
 
-<<<<<<< nsHTMLStyleSheet.cpp
-  nsresult ConstructTreeFrame(nsIPresContext*   aPresContext,
-                               nsIContent*      aContent,
-                               nsIFrame*        aParent,
-                               nsIStyleContext* aStyleContext,
-                               nsAbsoluteItems& aAboluteItems,
-                               nsIFrame*&       aNewFrame);
-
-  nsresult ConstructTreeBodyFrame(nsIPresContext*       aPresContext,
-                                       nsIContent*      aContent,
-                                       nsIFrame*        aParent,
-                                       nsIStyleContext* aStyleContext,
-                                       nsIFrame*&       aNewScrollFrame,
-                                       nsIFrame*&       aNewFrame);
-
-  nsresult ConstructTreeCellFrame(nsIPresContext*   aPresContext,
-                                   nsIContent*      aContent,
-                                   nsIFrame*        aParentFrame,
-                                   nsIStyleContext* aStyleContext,
-                                   nsAbsoluteItems& aAbsoluteItems,
-                                   nsIFrame*&       aNewFrame);
-=======
   nsresult ConstructTreeFrame(nsIPresContext*  aPresContext,
                               nsIContent*      aContent,
                               nsIFrame*        aParent,