diff --git a/.gitignore b/.gitignore
index 2ee863e..8438d4b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -103,8 +103,5 @@ dist
 # TernJS port file
 .tern-port
 
-<<<<<<< HEAD
-/**/*.umi
-=======
 .umi/
->>>>>>> upstream/master
+.umi-production/
\ No newline at end of file
diff --git a/.umirc.ts b/.umirc.ts
index c2822da..c632179 100644
--- a/.umirc.ts
+++ b/.umirc.ts
@@ -9,9 +9,6 @@ export default defineConfig({
     immer: true,
   },
   antd: {},
-  sass: {
-    implementation: require('node-sass'),
-  },
   title: '趣谈前端-h5-visible-tool',
   exportStatic: {},
   base: 'h5_plus',