diff --git a/collects/help/servlets/private/split-screen.ss b/collects/help/servlets/private/split-screen.ss
index 3d15029eef..020a21fbd6 100644
--- a/collects/help/servlets/private/split-screen.ss
+++ b/collects/help/servlets/private/split-screen.ss
@@ -118,16 +118,6 @@
 
   (define (html-left-item item)
     (match item
-<<<<<<< .mine
-      ['UP                (list '(font ((size "-2")) nbsp))]
-      ['--                (list '(tr (td " ") ((height "4")) (td ((colspan "2")))))]
-      [('VERBATIM sxml)   (list `(tr (td ((align "center")) ,sxml)))]
-      [(header)           (list `(tr (td  #;((colspan "2")) ,header)))]
-      [(header body ...)  (list `(tr (td  #;((colspan "2")) ,header))
-                                `(tr (td  ,@body)))]
-      [other              (list other)]))
-  
-=======
       ['UP               (list '(font ((size "-2")) nbsp))]
       ['--               (list '(tr ((height "4")) (td ((colspan "2")))))]
       [('VERBATIM sxml)  (list `(tr (td ((align "center")) ,sxml)))]
@@ -135,8 +125,7 @@
       [(header body ...) (list `(tr (td #;((colspan "2")) ,header))
                                `(tr (td ,@body)))]
       [other             (list other)]))
-
->>>>>>> .r7191
+  
   (define (html-right-items items)
     (mappend html-right-item items))