diff --git a/CHANGELOG.md b/CHANGELOG.md
index c90c7d123..e2437a640 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,16 +1,12 @@
+**Zixaphir**:
+- Bugfix
+
 ### v2.9.28 
 *2014-05-27*
 
-<<<<<<< HEAD
-### v2.9.26 
-*2014-05-07*
-=======
 **MayhemYDG**:
 - [Security fix](https://github.com/MayhemYDG/4chan-x/issues/1634).
 
-### v1.7.33 
-*2014-05-10*
-
 **DamonGant**
 - Add Innovandalism Archive.
 
@@ -18,59 +14,25 @@
 - Update archive list.
 - Add "disabled" option when Foolz Beta is the only choice.
 
-### v1.7.32 
-*2014-05-10*
-
 **Zixaphir, ccd0**
 - Bug fixes in linkification/embedding.
 
 **ccd0**
 - Begin refactoring code to reduce potential for introducing Javascript injection bugs.
-
-### v1.7.31 
-*2014-05-08*
+- Fix some potential Javascript injection issues.
+- Bug fixes.
 
 **Zixaphir**
 - Refactoring, bug fixes.
 
-**ccd0**
-- Fix some potential Javascript injection issues.
-- Bug fixes.
-
-### v1.7.30 
-*2014-05-05*
-
 **thebladeee**
 - Update archives.
 
-### v1.7.29 
-*2014-05-03*
-
-**ccd0**:
-- If the original post form not hidden, it is expanded (except on the catalog page).
-- 4chan's horizontal rules are no longer hidden. If you want to hide them as before, add the old code to your custom CSS:
-```
-body > hr,
-#blotter hr,
-.desktop > hr,
-#delform > hr,
-#content > hr {
-  display: none;
-}
-:root.index .board > hr:last-of-type,
-:root.thread .board > hr {
-  border: 0px;
-  margin: 0px;
-}
-```
-
-### v1.7.28 
-*2014-05-03*
-
 **ccd0**:
 - Copy Mayhem's fix for 4chan post form changes.
->>>>>>> v3
 
+### v2.9.26 
+*2014-05-07*
 **zixaphir**
 - Fixed (maybe?) a vulnerability in the post parser that allowed playful users to inject scripts or elements into posts, which could be used maliciously.
 
diff --git a/LICENSE b/LICENSE
index 364150458..636eb5597 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
 /*
-* appchan x - Version 2.9.28 - 2014-05-29
+* appchan x - Version 2.9.29 - 2014-05-29
 *
 * Licensed under the MIT license.
 * https://github.com/zixaphir/appchan-x/blob/master/LICENSE
diff --git a/builds/appchan-x.meta.js b/builds/appchan-x.meta.js
index aab2cb5ea..ac7b46ac4 100644
--- a/builds/appchan-x.meta.js
+++ b/builds/appchan-x.meta.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         appchan x
-// @version      2.9.28
+// @version      2.9.29
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    zixaphir
diff --git a/builds/appchan-x.user.js b/builds/appchan-x.user.js
index cf87e6f33..e761aaf2d 100644
--- a/builds/appchan-x.user.js
+++ b/builds/appchan-x.user.js
@@ -1,7 +1,7 @@
 // Generated by CoffeeScript
 // ==UserScript==
 // @name         appchan x
-// @version      2.9.28
+// @version      2.9.29
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    zixaphir
@@ -25,7 +25,7 @@
 // ==/UserScript==
 
 /*
-* appchan x - Version 2.9.28 - 2014-05-29
+* appchan x - Version 2.9.29 - 2014-05-29
 *
 * Licensed under the MIT license.
 * https://github.com/zixaphir/appchan-x/blob/master/LICENSE
@@ -483,7 +483,7 @@
   doc = d.documentElement;
 
   g = {
-    VERSION: '2.9.28',
+    VERSION: '2.9.29',
     NAMESPACE: 'appchan_x.',
     boards: {}
   };
diff --git a/builds/appchan-x.zip b/builds/appchan-x.zip
index d477488b9..80b3565ce 100644
Binary files a/builds/appchan-x.zip and b/builds/appchan-x.zip differ
diff --git a/builds/crx/manifest.json b/builds/crx/manifest.json
index b7d88061c..63528a4d1 100644
--- a/builds/crx/manifest.json
+++ b/builds/crx/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "appchan x",
-  "version": "2.9.28",
+  "version": "2.9.29",
   "manifest_version": 2,
   "description": "The most comprehensive 4chan userscript.",
   "icons": {
diff --git a/builds/crx/script.js b/builds/crx/script.js
index 83ca9ff3d..5d7d00bdb 100644
--- a/builds/crx/script.js
+++ b/builds/crx/script.js
@@ -1,6 +1,6 @@
 // Generated by CoffeeScript
 /*
-* appchan x - Version 2.9.28 - 2014-05-29
+* appchan x - Version 2.9.29 - 2014-05-29
 *
 * Licensed under the MIT license.
 * https://github.com/zixaphir/appchan-x/blob/master/LICENSE
@@ -458,7 +458,7 @@
   doc = d.documentElement;
 
   g = {
-    VERSION: '2.9.28',
+    VERSION: '2.9.29',
     NAMESPACE: 'appchan_x.',
     boards: {}
   };
diff --git a/package.json b/package.json
index 13d841fcb..f2c1d19c5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "appchan-x",
-  "version": "2.9.28",
+  "version": "2.9.29",
   "description": "The most comprehensive 4chan userscript.",
   "meta": {
     "name": "appchan x",