diff --git a/package.json b/package.json
index 4142136..7b05f91 100644
--- a/package.json
+++ b/package.json
@@ -47,11 +47,11 @@
 				"command": "mind-reader.selectTheme",
 				"title": "Select Theme"
 			},
-<<<<<<< HEAD
+
 			{
 				"command": "mind-reader.openWebview",
-				"title": "Mind Reader Webview"
-=======
+				"title": "Mind Reader Webview
+			},
 
 			{
 				"command": "mind-reader.runLineContext",
@@ -65,7 +65,6 @@
 			{
 				"command": "mind-reader.getIndent",
 				"title": "Get Line Indentation"
->>>>>>> master
 			}
 
 		],