diff --git a/libavcodec/vda.c b/libavcodec/vda.c
index e910ce1332..05e6da42f6 100644
--- a/libavcodec/vda.c
+++ b/libavcodec/vda.c
@@ -149,14 +149,6 @@ int ff_vda_create_decoder(struct vda_context *vda_ctx,
 
     pthread_mutex_init(&vda_ctx->queue_mutex, NULL);
 
-<<<<<<< HEAD
-    if (extradata[4]==0xFE) {
-        // convert 3 byte NAL sizes to 4 byte
-        extradata[4] = 0xFF;
-    }
-
-||||||| merged common ancestors
-=======
     /* Each VCL NAL in the bistream sent to the decoder
      * is preceeded by a 4 bytes length header.
      * Change the avcC atom header if needed, to signal headers of 4 bytes. */
@@ -177,27 +169,14 @@ int ff_vda_create_decoder(struct vda_context *vda_ctx,
         avc_data = CFDataCreate(kCFAllocatorDefault, extradata, extradata_size);
     }
 
->>>>>>> qatar/master
     config_info = CFDictionaryCreateMutable(kCFAllocatorDefault,
                                             4,
                                             &kCFTypeDictionaryKeyCallBacks,
                                             &kCFTypeDictionaryValueCallBacks);
 
-<<<<<<< HEAD
-    height = CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &vda_ctx->height);
-    width = CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &vda_ctx->width);
-    format = CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &vda_ctx->format);
-    avc_data = CFDataCreate(kCFAllocatorDefault, extradata, extradata_size);
-||||||| merged common ancestors
     height   = CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &vda_ctx->height);
     width    = CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &vda_ctx->width);
     format   = CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &vda_ctx->format);
-    avc_data = CFDataCreate(kCFAllocatorDefault, extradata, extradata_size);
-=======
-    height   = CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &vda_ctx->height);
-    width    = CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &vda_ctx->width);
-    format   = CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &vda_ctx->format);
->>>>>>> qatar/master
 
     CFDictionarySetValue(config_info, kVDADecoderConfiguration_Height, height);
     CFDictionarySetValue(config_info, kVDADecoderConfiguration_Width, width);