diff --git a/Makefile b/Makefile
index 1f55f0b..83bdebe 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 
 USER_GH=eyedeekay
-VERSION=0.32.01
+VERSION=0.32.1
 
 echo:
 	@echo "type make version to do release $(VERSION)"
diff --git a/debian/changelog b/debian/changelog
index 5bf8b39..9c1f42d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,11 @@
-<<<<<<< HEAD
-golang-github-eyedeekay-sam3 (0.3.2.5) bionic; urgency=medium
+golang-github-eyedeekay-sam3 (0.3.2.1) bionic; urgency=medium
 
   [ idk ]
-  * Updates to SAMv3.2
-  * Move i2pkeys to own directory/library
-  * Bug fixes
+  * Add support for 44-character destination hashes.
+
+ -- idk <hankhill19580@gmail.com>  Sat, 7 Dec 2019 17:30:30 -0500
+
 
- -- idk <hankhill19580@gmail.com>  Thu, 28 Feb 2019 21:40:35 -0500
-=======
 golang-github-eyedeekay-sam3 (0.3.2.01) bionic; urgency=medium
 
   [ idk ]
@@ -23,8 +21,6 @@ golang-github-eyedeekay-sam3 (0.3.2.0) bionic; urgency=medium
 
  -- idk <hankhill19580@gmail.com>  Sat, 18 May 2019 18:32:51 -0500
 
->>>>>>> stable
-
 golang-github-eyedeekay-sam3 (0.0~git20190223.af5a3f3) bionic; urgency=medium
 
   [ idk ]