diff --git a/.gitignore b/.gitignore
index 2a6c6bd39..3a1b27a1e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,11 +3,8 @@ node_modules/
 *.db
 tmp-crx/
 tmp-userscript/
-<<<<<<< HEAD
-=======
 testbuilds/
 builds/4chan-X.zip
->>>>>>> v3
 Gruntfile.js
 builds/4chan-*
 Gruntfile.js
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 399777ac6..3a1340e6c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+### v2.9.23 
+*2014-05-03*
+
+**zixaphir**
+- Bugfixes
+
 ### v2.9.22 
 *2014-05-03*
 
@@ -15,7 +21,7 @@
 - Check dimensions and duration of .webm files before posting.
 - Partly restore Mayhem's captcha changes reverted in last version. Captchas are now destroyed after posting instead of reloaded, unless `Auto-load captcha` is checked. Captcha caching is still enabled.
 - Thumbnails for .webm files in Quick Reply.
-- Revert captcha fixes of 1.4.2 as Google appears to have reverted the changes on its end. This restores captcha caching.
+- Revert captcha fixes as Google appears to have reverted the changes on its end. This restores captcha caching.
 - Quick fix for moot breaking captcha.
 - Restore `Comment Expansion`.
 - Another update to handle HTML changes.
diff --git a/LICENSE b/LICENSE
index e7c4cc39e..d8b1571c1 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
 /*
-* appchan x - Version 2.9.22 - 2014-05-03
+* appchan x - Version 2.9.23 - 2014-05-03
 *
 * 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 a7b1ee59d..43436721d 100644
--- a/builds/appchan-x.meta.js
+++ b/builds/appchan-x.meta.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         appchan x
-// @version      2.9.22
+// @version      2.9.23
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    zixaphir
diff --git a/builds/appchan-x.user.js b/builds/appchan-x.user.js
index 869a9efa2..a5c68338f 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.22
+// @version      2.9.23
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    zixaphir
@@ -25,7 +25,7 @@
 // ==/UserScript==
 
 /*
-* appchan x - Version 2.9.22 - 2014-05-03
+* appchan x - Version 2.9.23 - 2014-05-03
 *
 * 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.22',
+    VERSION: '2.9.23',
     NAMESPACE: 'appchan_x.',
     boards: {}
   };
diff --git a/builds/appchan-x.zip b/builds/appchan-x.zip
index 08815c0c1..d25ea160d 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 50ff15433..3e5bc4ce0 100644
--- a/builds/crx/manifest.json
+++ b/builds/crx/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "appchan x",
-  "version": "2.9.22",
+  "version": "2.9.23",
   "manifest_version": 2,
   "description": "The most comprehensive 4chan userscript.",
   "icons": {
diff --git a/builds/crx/script.js b/builds/crx/script.js
index 6d7054f3c..6b96467f3 100644
--- a/builds/crx/script.js
+++ b/builds/crx/script.js
@@ -1,6 +1,6 @@
 // Generated by CoffeeScript
 /*
-* appchan x - Version 2.9.22 - 2014-05-03
+* appchan x - Version 2.9.23 - 2014-05-03
 *
 * 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.22',
+    VERSION: '2.9.23',
     NAMESPACE: 'appchan_x.',
     boards: {}
   };
diff --git a/package.json b/package.json
index aa0427ecd..4e50e9889 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "appchan-x",
-  "version": "2.9.22",
+  "version": "2.9.23",
   "description": "The most comprehensive 4chan userscript.",
   "meta": {
     "name": "appchan x",