Fix merge commit

package.json

@@ -1,10 +1,6 @@
 {
   "name"        : "semantic-ui",
-<<<<<<< HEAD
   "version"     : "2.0.0",
-=======
-  "version"     : "1.12.2",
->>>>>>> 8d9f4e684156e4f62f5ff8c2a2e65cb657d7949e
   "title"       : "Semantic UI",
   "description" : "Semantic empowers designers and developers by creating a shared vocabulary for UI.",
   "homepage"    : "http://www.semantic-ui.com",
@@ -49,73 +45,39 @@
     "require-dot-file": "*"
   },
   "dependencies": {
-<<<<<<< HEAD
+    "better-console"    : "*",
-    "better-console": "*",
+    "del"               : "^1.1.1",
-    "del": "^1.1.1",
+    "extend"            : "^2.0.0",
-    "extend": "^2.0.0",
+    "gulp"              : "^3.8.11",
-    "gulp": "^3.8.11",
+    "gulp-autoprefixer" : "^2.1.0",
-    "gulp-autoprefixer": "^2.1.0",
+    "gulp-chmod"        : "*",
-    "gulp-chmod": "*",
+    "gulp-clone"        : "^1.0.0",
-    "gulp-clone": "^1.0.0",
+    "gulp-concat"       : "^2.5.2",
-    "gulp-concat": "^2.5.2",
+    "gulp-concat-css"   : "^2.1.2",
-    "gulp-concat-css": "^2.1.2",
+    "gulp-copy"         : "*",
-    "gulp-copy": "*",
+    "gulp-flatten"      : "*",
-    "gulp-flatten": "*",
+    "gulp-header"       : "^1.2.2",
-    "gulp-header": "^1.2.2",
+    "gulp-help"         : "^1.3.4",
-    "gulp-help": "^1.3.4",
+    "gulp-if"           : "*",
-    "gulp-if": "*",
+    "gulp-json-editor"  : "^2.2.1",
-    "gulp-json-editor": "^2.2.1",
+    "gulp-less"         : "^3.0.2",
-    "gulp-less": "^3.0.2",
+    "gulp-minify-css"   : "^1.0.0",
-    "gulp-minify-css": "^1.0.0",
+    "gulp-notify"       : "^2.2.0",
-    "gulp-notify": "^2.2.0",
+    "gulp-plumber"      : "^1.0.0",
-    "gulp-plumber": "^1.0.0",
+    "gulp-print"        : "^1.1.0",
-    "gulp-print": "^1.1.0",
+    "gulp-prompt"       : "^0.1.2",
-    "gulp-prompt": "^0.1.2",
+    "gulp-rename"       : "^1.2.0",
-    "gulp-rename": "^1.2.0",
+    "gulp-replace"      : "^0.5.3",
-    "gulp-replace": "^0.5.3",
+    "gulp-rtlcss"       : "^0.1.4",
-    "gulp-rtlcss": "^0.1.4",
+    "gulp-uglify"       : "^1.1.0",
-    "gulp-uglify": "^1.1.0",
+    "gulp-util"         : "^3.0.4",
-    "gulp-util": "^3.0.4",
+    "gulp-watch"        : "^4.2.0",
-    "gulp-watch": "^4.2.0",
+    "jquery"            : "^2.1.3",
-    "jquery": "^2.1.3",
+    "mkdirp"            : "^0.5.0",
-    "mkdirp": "^0.5.0",
+    "require-dot-file"  : "^0.4.0",
-    "require-dot-file": "^0.4.0",
+    "map-stream"        : "^0.1.0",
-    "map-stream": "^0.1.0",
+    "yamljs"            : "^0.2.1",
-    "yamljs": "^0.2.1",
-    "wrench": "git://github.com/derekslife/wrench-js.git#156eaceed68ed31ffe2a3ecfbcb2be6ed1417fb2"
-=======
-    "better-console"    : "0.*",
-    "del"               : "1.*",
-    "extend"            : "2.*",
-    "gulp"              : "3.*",
-    "gulp-autoprefixer" : "2.*",
-    "gulp-chmod"        : "1.*",
-    "gulp-clone"        : "1.*",
-    "gulp-concat"       : "2.*",
-    "gulp-concat-css"   : "2.*",
-    "gulp-copy"         : "0.*",
-    "gulp-flatten"      : "0.*",
-    "gulp-header"       : "1.*",
-    "gulp-help"         : "1.*",
-    "gulp-if"           : "1.*",
-    "gulp-json-editor"  : "2.*",
-    "gulp-less"         : "3.*",
-    "gulp-minify-css"   : "0.*",
-    "gulp-notify"       : "2.*",
-    "gulp-plumber"      : "0.*",
-    "gulp-print"        : "1.*",
-    "gulp-prompt"       : "0.*",
-    "gulp-rename"       : "1.*",
-    "gulp-replace"      : "0.*",
-    "gulp-rtlcss"       : "0.*",
-    "gulp-uglify"       : "1.*",
-    "gulp-util"         : "3.*",
-    "gulp-watch"        : "4.*",
-    "jquery"            : "x.*",
-    "mkdirp"            : "0.*",
-    "require-dot-file"  : "0.*",
     "wrench"            : "https://github.com/derekslife/wrench-js/tarball/156eaceed68ed31ffe2a3ecfbcb2be6ed1417fb2"
->>>>>>> 8d9f4e684156e4f62f5ff8c2a2e65cb657d7949e
   },
   "devDependencies": {
     "github": "^0.2.3",