diff --git a/mpv.changes b/mpv.changes
index 6fd2bd0..0fe8f55 100644
--- a/mpv.changes
+++ b/mpv.changes
@@ -135,7 +135,6 @@ Tue Jul 18 19:42:17 UTC 2017 - 9@cirno.systems
   * ytdl_hook: treat single-entry playlists as a single video
 
 -------------------------------------------------------------------
->>>>>>> ./mpv.changes.rcf94f24b222293c0f1dd5c61baca88f4
 Mon May 22 08:41:28 UTC 2017 - tchvatal@suse.com
 
 - Depend on lua-5.1 as 5.3 is incompatible wrt bsc#1040034