diff --git a/multimedia/video/xine-lib/files/xine-lib-ffmpeg3.patch b/multimedia/video/xine-lib/files/xine-lib-ffmpeg3.patch
index 1f6806906c..f0cbc47488 100644
--- a/multimedia/video/xine-lib/files/xine-lib-ffmpeg3.patch
+++ b/multimedia/video/xine-lib/files/xine-lib-ffmpeg3.patch
@@ -52,8 +52,4 @@ Index: xine-lib-1.2.6/src/combined/ffmpeg/ff_video_decoder.c
 +  this->picture = av_frame_alloc();
    if (!this->picture) {
      xprintf(drv->class->xine, XINE_VERBOSITY_LOG,
-<<<<<<< HEAD
        "dxr3_mpeg_encoder: Couldn't allocate ffmpeg frame\n");
-=======
-       "dxr3_mpeg_encoder: Couldn't allocate ffmpeg frame\n");
->>>>>>> a702ec9aec8c201fc9985eed2bed7e5b675a5129
diff --git a/multimedia/video/xine-lib/pspec.xml b/multimedia/video/xine-lib/pspec.xml
index 93e4878ac9..88cb726bf2 100644
--- a/multimedia/video/xine-lib/pspec.xml
+++ b/multimedia/video/xine-lib/pspec.xml
@@ -138,11 +138,7 @@
 
     <History>
         <Update release="2">
-<<<<<<< HEAD
             <Date>2016-06-14</Date>
-=======
-            <Date>2016-06-13</Date>
->>>>>>> a702ec9aec8c201fc9985eed2bed7e5b675a5129
             <Version>1.2.6</Version>
             <Comment>Release Bump.</Comment>
             <Name>Pisi Linux Community</Name>