diff --git a/sys/osxaudio/gstosxcoreaudiocommon.h b/sys/osxaudio/gstosxcoreaudiocommon.h
index c079e5096c..e9fbb8e7fd 100644
--- a/sys/osxaudio/gstosxcoreaudiocommon.h
+++ b/sys/osxaudio/gstosxcoreaudiocommon.h
@@ -22,11 +22,7 @@
  */
 
 #include "gstosxcoreaudio.h"
-<<<<<<<
-#include <gst/audio/multichannel.h>
-=======
 #include <gst/audio/audio-channels.h>
->>>>>>>
 
 typedef struct
 {