diff --git a/debian/changelog b/debian/changelog
index ab11d14..98b7b25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,16 +1,11 @@
-<<<<<<< HEAD
-trimage (1.1.0b-0ubuntu1) jaunty; urgency=low
-
-  * use multiprocessing for images
-=======
 trimage (1.0.1b-0ubuntu1) jaunty; urgency=low
 
   * use a threadpool for images
->>>>>>> development/development
   * more robust file handling
   * re-adding images now results in recompressing them
   * compressing message now shows filename
   * wider array of status messages in the table
+  * add a notification area icon
 
  -- Kilian Valkhof <kilian@kdesktop>  Mon, 29 Mar 2010 13:08:18 +0200
 
diff --git a/website/index.html b/website/index.html
index 23807d6..8281a3c 100644
--- a/website/index.html
+++ b/website/index.html
@@ -165,21 +165,20 @@
     </div>
 
     <h2>Planned features</h2>
-    <p>Version 1.0.0 final:</p>
+    <p>Version 1.1.0 final:</p>
     <ul>
       <li>Expand command line options</li>
       <li>Make sure a compressed file is always smaller than the original one, or don't compress</li>
       <li>General refactoring</li>
     </ul>
-    <p>Version 1.1.0 final:</p>
+    <p>Version 1.1.1 final:</p>
     <ul>
-      <li>Use multiprocessing</li>
+      <li>Use multiprocessing instead of threads</li>
     </ul>
 
     <p>Beyond that</p>
     <ul>
       <li>Deletion of rows in the table view</li>
-      <li>Notification area widget</li>
       <li>Integration with online services such as punypng</li>
       <li><a href="mailto:help@trimage.org">Suggest something</a></li>
     </ul>