diff --git a/libs/spandsp/src/t42.c b/libs/spandsp/src/t42.c
index 30127cb3b3..0163ff52f5 100644
--- a/libs/spandsp/src/t42.c
+++ b/libs/spandsp/src/t42.c
@@ -1030,11 +1030,7 @@ SPAN_DECLARE(int) t42_itulab_to_itulab(logging_state_t *logging, tdata_t *dst, t
 
     for (pos = 0;  pos < srclen;  pos += compressor.image_width*compressor.num_components)
     {
-<<<<<<< HEAD
         scan_line_in = (JSAMPROW) src + pos;
-=======
-        scan_line_in = (JSAMPROW)src + pos;
->>>>>>> FS-4504 vs2010 only -  plus mod_sofia fix - anybody want to help with 2008
         jpeg_write_scanlines(&compressor, &scan_line_in, 1);
     }
 
@@ -1151,11 +1147,7 @@ SPAN_DECLARE(int) t42_itulab_to_srgb(logging_state_t *logging, lab_params_t *s,
 
     for (pos = 0;  decompressor.output_scanline < decompressor.output_height;  pos += decompressor.output_width*decompressor.num_components)
     {
-<<<<<<< HEAD
         scan_line_out = (JSAMPROW) dst + pos;
-=======
-        scan_line_out = (JSAMPROW)dst + pos;
->>>>>>> FS-4504 vs2010 only -  plus mod_sofia fix - anybody want to help with 2008
         jpeg_read_scanlines(&decompressor, &scan_line_in, 1);
         lab_to_srgb(s, scan_line_out, scan_line_in, decompressor.output_width);
     }