changed sublime config

.config/sublime-text-3/Packages/User/Package Control.sublime-settings

@@ -14,6 +14,7 @@
 		"Emmet",
 		"Emoji",
 		"Git",
+		"Git Conflict Resolver",
 		"GitGutter",
 		"HTML-CSS-JS Prettify",
 		"Markdown Preview",