diff --git a/CHANGELOG.md b/CHANGELOG.md
index 285a90f19..26df90f25 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,16 @@
-<<<<<<< HEAD
-### v2.7.5 
-*2014-01-04*
+## v2.8.0 
+*2014-01-11*
+
+
+**seaweedchan**:
+- Various fixes and improvements for the JSONified index
+- Removed unnecessary index refresh notifications
+- Various style tweaks
+
+**Zixaphir**:
+- Various fixes and improvements for the JSONified index
+- We now use JSON for navigating between boards and threads. This should result in various bandwidth and performance improvements. Probably.
+- Users are now subjected to whatever terrible code went into that previous feature. :3
 
 ### v2.7.4 
 *2013-12-27*
@@ -56,10 +66,6 @@
 
 ## v2.6.0 
 *2013-11-27*
-=======
-## v1.3.0 
-*2014-01-10*
->>>>>>> json
 
 **MayhemYDG**:
 - **New option**: `Auto-hide header on scroll`.
@@ -103,42 +109,10 @@
  - You cannot post an image reply immediately after a non-image reply anymore.
 - Various minor fixes
 
-<<<<<<< HEAD
 ### v2.5.1 
 *2013-10-20*
 **Zixaphir**:
 - Infinite Scrolling Bugfix (chrome)
-=======
-**seaweedchan**:
-- Various fixes and improvements for the JSONified index
-- Removed index refresh notifications
-- Various style tweaks
-
-**Zixaphir**:
-- FappeTyme and WerkTyme now persist across sessions.
-- Various fixes and improvements for the JSONified index
-
-### v1.2.45 
-*2014-01-07*
-
-**seaweedchan**:
-- Remove moot's plea to remove ad-blocker
-- Hopefully fix NSFW themes and 404 image redirecting
-- Update archive list
-
-**Zixaphir**:
-- Fix optional increase for thread updater
-
-### v1.2.44 
-*2013-12-06*
-
-**MayhemYDG**:
-- Cooldown fix (You can no longer post an image reply immediately after a text reply)
-- Fix for 4chan markup change that caused a lot of errors
-
-**seaweedchan**:
-- Fix catalog links option
->>>>>>> json
 
 ### v2.4.1 
 *2013-10-13*
diff --git a/LICENSE b/LICENSE
index 949514faa..89cf331f1 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
 /*
-* appchan x - Version 2.7.5 - 2014-01-11
+* appchan x - Version 2.8.0 - 2014-01-11
 *
 * 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 4a10b81de..09364502b 100644
--- a/builds/appchan-x.meta.js
+++ b/builds/appchan-x.meta.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         appchan x
-// @version      2.7.5
+// @version      2.8.0
 // @minGMVer     1.13
 // @minFFVer     26
 // @namespace    zixaphir
diff --git a/builds/appchan-x.user.js b/builds/appchan-x.user.js
index fa13e01e7..1b2c82f0c 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.7.5
+// @version      2.8.0
 // @minGMVer     1.13
 // @minFFVer     26
 // @namespace    zixaphir
@@ -22,7 +22,7 @@
 // ==/UserScript==
 
 /*
-* appchan x - Version 2.7.5 - 2014-01-11
+* appchan x - Version 2.8.0 - 2014-01-11
 *
 * Licensed under the MIT license.
 * https://github.com/zixaphir/appchan-x/blob/master/LICENSE
@@ -460,7 +460,7 @@
   doc = d.documentElement;
 
   g = {
-    VERSION: '2.7.5',
+    VERSION: '2.8.0',
     NAMESPACE: 'appchan_x.',
     TYPE: 'sfw',
     boards: {},
diff --git a/builds/appchan-x.zip b/builds/appchan-x.zip
index ab84e474b..4eeb09d28 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 8bab0cf5f..6d472b7be 100644
--- a/builds/crx/manifest.json
+++ b/builds/crx/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "appchan x",
-  "version": "2.7.5",
+  "version": "2.8.0",
   "manifest_version": 2,
   "description": "The most comprehensive 4chan userscript.",
   "icons": {
diff --git a/builds/crx/script.js b/builds/crx/script.js
index e6f797a22..5af7d9b72 100644
--- a/builds/crx/script.js
+++ b/builds/crx/script.js
@@ -1,6 +1,6 @@
 // Generated by CoffeeScript
 /*
-* appchan x - Version 2.7.5 - 2014-01-11
+* appchan x - Version 2.8.0 - 2014-01-11
 *
 * Licensed under the MIT license.
 * https://github.com/zixaphir/appchan-x/blob/master/LICENSE
@@ -439,7 +439,7 @@
   doc = d.documentElement;
 
   g = {
-    VERSION: '2.7.5',
+    VERSION: '2.8.0',
     NAMESPACE: 'appchan_x.',
     TYPE: 'sfw',
     boards: {},
diff --git a/latest.js b/latest.js
index 12d02060d..6970b0c1e 100644
--- a/latest.js
+++ b/latest.js
@@ -1 +1 @@
-postMessage({version:'2.7.5'},'*')
+postMessage({version:'2.8.0'},'*')
diff --git a/package.json b/package.json
index ae108ba66..f1cc86b8f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "appchan-x",
-  "version": "2.7.5",
+  "version": "2.8.0",
   "description": "The most comprehensive 4chan userscript.",
   "meta": {
     "name": "appchan x",