diff --git a/debian/changelog b/debian/changelog
index 5bc1efa..ab11d14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,12 @@
+<<<<<<< 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
diff --git a/src/trimage/trimage.py b/src/trimage/trimage.py
old mode 100644
new mode 100755
diff --git a/trimage b/trimage
old mode 100644
new mode 100755