diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d516a1bd..d38a8cd67 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,8 @@
-<<<<<<< HEAD
 seaweedchan:
 - Fix emoji and favicon previews not updating on change.
-=======
-- Fix bug where a thread would freeze on load.
 
-### 3.2.1 - *2013-04-26*
->>>>>>> mayhem/v3
+MayhemYDG:
+- Fix bug where a thread would freeze on load.
 
 ### 1.1.1 - 2013-04-26
 zixaphir: