Fix commit mistake

package.json

@@ -71,7 +71,6 @@
 				}
 			}
 		],
-<<<<<<< HEAD
 		"viewsContainers": {
 			"activitybar": [
 				{
@@ -91,15 +90,13 @@
 					"contextualTitle": "Modest"
 				}
 			]
-		}
-=======
+		},
 		"snippets": [
 			{
 			  "language": "modest",
 			  "path": "./snippets.json"
 			}
 		  ]
->>>>>>> 5212073769854decea419622cedfcbe0856f1140
 	},
 	"activationEvents": [
 		"onCommand:modest.simulate",