diff --git a/package.json b/package.json
index 44eb7f4..b67aa77 100644
--- a/package.json
+++ b/package.json
@@ -70,11 +70,7 @@
 		"themes": [
 			{
 				"label": "Material Theme",
-<<<<<<< HEAD
-				"path": "./themes/Material-Theme-Palenight.json",
-=======
 				"path": "./themes/Material-Theme-Default.json",
->>>>>>> 65fc2cae16345c34c34e2475d767d9f5ab18f50b
 				"uiTheme": "vs-dark"
 			}
 		],