Resolve conflicts in package.json

package.json

@@ -24,13 +24,8 @@
     "@babel/plugin-syntax-dynamic-import": "^7.0.0",
     "@babel/plugin-syntax-import-meta": "^7.0.0",
     "@babel/preset-env": "^7.1.0",
-<<<<<<< HEAD
-    "@gitlab/ui": "^1.11.0",
-    "@gitlab/svgs": "^1.35.0",
-=======
     "@gitlab/svgs": "^1.38.0",
     "@gitlab/ui": "^1.11.0",
->>>>>>> upstream/master
     "autosize": "^4.0.0",
     "axios": "^0.17.1",
     "babel-loader": "^8.0.4",