diff --git a/project.properties b/project.properties
index fc646b5..11179d2 100644
--- a/project.properties
+++ b/project.properties
@@ -1,12 +1,6 @@
-<<<<<<< HEAD
-#Sat, 11 Jan 2014 18:55:50 -0600
+#Fri, 21 Nov 2014 10:16:37 -0600
 name=jdb-util
-version=2.3
-=======
-#Wed, 29 Oct 2014 19:31:44 -0500
-name=jdb-util
-version=3.1
->>>>>>> 14332b878ce29d57aee9bea47bc4e42ff4555612
+version=3.2
 lib.local=true
 
 build.number=0