diff --git a/ChangeLog b/ChangeLog
index 0b41fd8bc..60d63611d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,8 @@
     full details.
   + Export was including 'id' in the column header even though it was not
     included in the data.
+  + The task file format has changed slightly.  Please back up your task
+    data files before upgrading to 1.6.0.
 
 ------ old releases ------------------------------
 
diff --git a/html/faq.html b/html/faq.html
index f001e2be8..d6af2b1d1 100644
--- a/html/faq.html
+++ b/html/faq.html
@@ -45,9 +45,10 @@
                        the colors.  How do I fix this?
                   </b>
                   <br />
-                  A: Task knows when the output is not going directly to a
-                     terminal, and strips out all the color control characters.
-                     Prevent this with the following entry in your .taskrc file:
+                  A: Task knows (or thinks it knows) when the output is not going
+                     directly to a terminal, and strips out all the color control
+                     characters.  Prevent this with the following entry in your
+                     .taskrc file:
                   <pre><code>_forcecolor=on</code></pre>
                 </p>
                 <hr>
@@ -85,6 +86,28 @@
                 </p>
                 <hr>
 
+                <p>
+                  <b>
+                    Q: Can I revert to a previous version of task?  How?
+                  </b>
+                  <br />
+                  A: Yes, you can revert to a previous version of task,
+                     simply by downloading an
+                     <a href="versions.html">older version</a> and
+                     installing it.  If you find a bug in task, then this
+                     may be the only way to work around the bug, until a
+                     new release is made.
+                </p>
+                <p>
+                  Note that it is possible that the task file format will
+                  change.  For example, the format changed between versions
+                  1.5.0 and 1.6.0.  Task will automatically upgrade the file
+                  but if you need to revert to a previous version of task,
+                  there is the file format to consider.  This is yet another
+                  good reason to back up your task data files!
+                </p>
+                <hr>
+
 <!--
                 <p>
                   <b>
diff --git a/html/task.html b/html/task.html
index 6bc817a08..03043ab1d 100644
--- a/html/task.html
+++ b/html/task.html
@@ -58,11 +58,8 @@
                 <li><a href="filter.html">Filters</a>
                 <li><a href="shadow.html">Shadow Files</a>
                 <li><a href="custom.html">Custom Reports</a>
-<<<<<<< HEAD:html/task.html
-                <li><a href="faq.html">Frequently Asked Questions</a>
-=======
                 <li><a href="import.html">Data Import</a>
->>>>>>> import:html/task.html
+                <li><a href="faq.html">Frequently Asked Questions</a>
               </ul>
 
               <p>
@@ -129,6 +126,8 @@
                       full details.
                   <li>Export was including 'id' in the column header even though it was not
                       included in the data.
+                  <li>The task file format has changed slightly.  Please back up your task
+                      data files before upgrading to 1.6.0.
                 </ul>
 
                 <p>