diff --git a/themes/next/source/css/_variables/custom.styl b/themes/next/source/css/_variables/custom.styl
index a15b793b..37a0b55e 100644
--- a/themes/next/source/css/_variables/custom.styl
+++ b/themes/next/source/css/_variables/custom.styl
@@ -2,8 +2,4 @@
 $content-desktop = 700px
 
 // 当视窗超过 1600px 后的宽度
-<<<<<<< HEAD
-$content-desktop-large = 700px
-=======
 $content-desktop-large = 900px
->>>>>>> abb65e61b75d94e9b265e42e76a0b58ee73b5e69