diff --git a/debian/changelog b/debian/changelog
index 7d3f434..c0a805b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,10 @@
-<<<<<<< HEAD
-moonlight-embedded (2.1.3-1jessie1) RELEASED; urgency=high
-=======
-moonlight-embedded (2.1.4-1wheezy1) RELEASED; urgency=high
+moonlight-embedded (2.1.4-1jessie1) RELEASED; urgency=high
 
   * Update to version 2.1.4
 
  -- Iwan Timmer <irtimmer@gmail.com>  Tue, 1 Mar 2016 20:23:54 +0200
 
-moonlight-embedded (2.1.3-1wheezy1) RELEASED; urgency=high
->>>>>>> raspbian/wheezy
+moonlight-embedded (2.1.3-1jessie1) RELEASED; urgency=high
 
   * Update to version 2.1.3