diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 868699cf77..401e9d6767 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -2501,11 +2501,7 @@
 		},
 		{
 			"ImportPath": "github.com/OpenBazaar/multiwallet/client/errors",
-<<<<<<< HEAD
-			"Rev": "2b4be2cd7336e77e7ceffe0bce05e8ebec3be287"
-=======
 			"Rev": "e2e450015927ced1aa82ded74eba802ec0b3ddf1"
->>>>>>> master
 		},
 		{
 			"ImportPath": "github.com/OpenBazaar/multiwallet/vendor/github.com/OpenBazaar/wallet-interface",
diff --git a/Procfile b/Procfile
new file mode 100644
index 0000000000..64f28a95e1
--- /dev/null
+++ b/Procfile
@@ -0,0 +1,2 @@
+release: openbazaar-go init
+web: openbazaar-go start
\ No newline at end of file