diff --git a/Jake/templates/package.json.tmpl b/Jake/templates/package.json.tmpl
index d5159473..b6c9d2e3 100644
--- a/Jake/templates/package.json.tmpl
+++ b/Jake/templates/package.json.tmpl
@@ -10,15 +10,13 @@
 			"url":  "http://www.apache.org/licenses/LICENSE-2.0"
 		}
 	],
-	"repositories": [
-		{
-			"type": "git",
-			"url":  "https://github.com/jsdoc3/jsdoc"
-		}
-	],
+	"repository": {
+		"type": "git",
+		"url":  "https://github.com/jsdoc3/jsdoc"
+	},
 	"dependencies": {
 		"async": "0.1.22",
-		"catharsis": "0.5.6",
+		"catharsis": "0.6.0",
 		"crypto-browserify": "git+https://github.com/dominictarr/crypto-browserify.git#95c5d505",
 		"js2xmlparser": "0.1.0",
 		"jshint": "0.9.1",
diff --git a/package.json b/package.json
index d9acc324..176bb1a0 100644
--- a/package.json
+++ b/package.json
@@ -1,12 +1,7 @@
 {
 	"name": "jsdoc",
-<<<<<<< HEAD
 	"version": "3.3.0-dev",
-	"revision": "1379480242214",
-=======
-	"version": "3.2.1",
-	"revision": "1380988759465",
->>>>>>> e8753db... 3.2.1 changelog; bump revision
+	"revision": "1380989053246",
 	"description": "An API documentation generator for JavaScript.",
 	"keywords": [ "documentation", "javascript" ],
 	"licenses": [