diff --git a/clog b/clog
index 7809fe1..6cda48b 100644
--- a/clog
+++ b/clog
@@ -1,2 +1,2 @@
-<<<<<<< HEAD
+update to 3.2.0