$ git diff
diff --cc debian/changelog
index 0d8e6f9,fffce22..0000000
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,8 +1,20 @@@
  repowerd (2016.08.3-0ubuntu1) UNRELEASED; urgency=medium
  
++<<<<<<<
 +  * New 2016.08.3 release
++=======
+   * Test for robru
++>>>>>>>
 +    - Fix "Low battery notification turns screen on and never turns
 +      it off again." (LP: #1618417)
 +    - Fix "lock display when idle timeout not honoured" (LP: #1615001)
 +    - Fix "Missing powerd-cli active" (LP: #1618072)
  
++<<<<<<<
 + -- Alexandros Frantzis <alexandros.frantzis@canonical.com>  Tue, 30 Aug 2016 18:49:04 +0300
++=======
+  -- Alexandros Frantzis <alexandros.frantzis@canonical.com>  Wed, 24 Aug 2016 19:18:53 +0300
++>>>>>>>
  
  repowerd (2016.08.2+16.10.20160823.1-0ubuntu1) yakkety; urgency=medium