diff --git a/collects/framework/private/scheme.ss b/collects/framework/private/scheme.ss
index 18cc2360..4f2d60f6 100644
--- a/collects/framework/private/scheme.ss
+++ b/collects/framework/private/scheme.ss
@@ -370,22 +370,6 @@
                       #f])))
                (scheme-paren:get-comments))))
           
-          
-<<<<<<< scheme.ss
-          (rename [super-on-close on-close])
-          (define/override (on-close)
-            (remove-indents-callback)
-            (remove-paren-callback)
-            (super-on-close))
-          
-          (define remove-indents-callback
-            (preferences:add-callback
-             'framework:tabify
-             (lambda (p value)
-               (set! indents value))))
-          (define indents (preferences:get 'framework:tabify))
-=======
->>>>>>> 1.40
           [define backward-cache (make-object match-cache:%)]
           [define forward-cache (make-object match-cache:%)]