diff --git a/debian/changelog b/debian/changelog
index 838dbd2..512fc76 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,14 @@
 a2pi (0.1.8-7) unstable; urgency=low
+<<<<<<< HEAD
+=======
+
+  * Only set GPCLK when using default RPi UART
+  * Add a2pi logo with transparent background
+
+ -- David Schmenk <dschmenk@gmail.com>  Sat, 07 Jul 2014 12:46:00 -0800
+
+a2pi (0.1.8-6) unstable; urgency=low
+>>>>>>> 73345729f9cba82fa6ecf52054c6c442f7e315c8
 
   * Only set GPCLK on default RPi UART
   * Stabilize request/pidrive interaction
diff --git a/share/UTILS.PO b/share/UTILS.PO
old mode 100755
new mode 100644
diff --git a/share/a2pi.jpg b/share/a2pi.jpg
new file mode 100644
index 0000000..8e89014
Binary files /dev/null and b/share/a2pi.jpg differ
diff --git a/share/a2pi.png b/share/a2pi.png
new file mode 100755
index 0000000..24bdf47
Binary files /dev/null and b/share/a2pi.png differ