diff --git a/ChangeLog b/ChangeLog
index 5580c7eea..79c7a9482 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -56,6 +56,8 @@
 - Improved certificate validation diagnostics
           (thanks to Jelle van der Waa).
 
+------ current release ---------------------------
+
 2.5.1 (2016-02-24) 8b4ae3b54b44dfbd00b96cdd6dceb8dfe7cc1ea0
 
 - TD-104  Unrecognized taskwarrior file format
@@ -166,6 +168,7 @@
 - The 'run_all' script was not correctly using exit code 0 when all tests pass
           (thanks to Gordon Ball).
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 ------ current release ---------------------------
 
@@ -174,6 +177,11 @@
 ------ old releases ------------------------------
 
 >>>>>>> 19b2151f... Cleanup: Removed deprecated 'alias._query' setting
+||||||| merged common ancestors
+------ current release ---------------------------
+
+=======
+>>>>>>> Bumped documentation to 2.6.0
 2.5.0 (2015-10-21) dd5968a61b1fab258b38879cfdbb7d67f1bcd550
 
 - TW-20   Task edit loses annotation precision, causing journal updating code
diff --git a/NEWS b/NEWS
index 1074aa75e..e51c930f8 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,8 @@
 New Features in Taskwarrior 2.5.2
 
   - The 'QUARTER' virutal tag was added.
+  - The 'help' command now takes a 'usage' argument, which displays only the
+    command usage.
 
 New Commands in Taskwarrior 2.5.2
 
@@ -9,7 +11,8 @@ New Commands in Taskwarrior 2.5.2
 
 New Configuration Options in Taskwarrior 2.5.2
 
-  -
+  - New 'relative' column format for 'date' type columns does what 'remaining'
+    and 'countdown' do, but in one format.
 
 Newly Deprecated Features in Taskwarrior 2.5.2
 
@@ -24,6 +27,13 @@ Newly Deprecated Features in Taskwarrior 2.5.2
 Removed Features in 2.5.2
 
   - Removed 'alias._query' default configuration.
+  - There is no longer a 16-color default configuration for some platforms,
+    making all platforms 256-color.
+  - The configuration setting 'burndown.bias' is no longer used.
+  - The algorithm used to estimate completion on the 'burndown' reports has
+    been replaced by something less icky. Estimates are now based on the net
+    completion rate after the peak number of pending tasks.
+  - The unused 'dom' and 'shell.prompt' configuration settings were removed.
 
 Known Issues