fix package.json

package.json

@@ -47,10 +47,6 @@
     "babel-preset-react": "^6.24.1",
     "babel-preset-stage-0": "^6.24.1",
     "babel-register": "^6.26.0",
-<<<<<<< HEAD
-    "canner-graphql-interface": "^1.15.0",
-=======
->>>>>>> opt-cli
     "canner-schema-loader": "^1.2.2",
     "canner-script": "^1.1.5",
     "cross-env": "^5.1.3",
@@ -88,7 +84,6 @@
     "apollo-boost": "^0.1.4",
     "bson-objectid": "^1.2.2",
     "canner-compiler": "^0.1.6",
-    "canner-helpers": "^0.1.15",
     "canner-ref-id": "^0.1.2",
     "graphql-tag": "^2.9.1",
     "immer": "^1.3.0",
@@ -104,13 +99,9 @@
     "react-intl": "^2.4.0",
     "react-loadable": "^5.3.1",
     "react-spinners": "^0.2.6",
-<<<<<<< HEAD
-    "styled-components": "^3.2.1"
-=======
     "styled-components": "^3.2.1",
     "canner-helpers": "^0.1.15",
     "canner-graphql-interface": "^1.15.0"
->>>>>>> opt-cli
   },
   "peerDependencies": {
     "canner-helpers": "^0.1.15",