diff --git a/src/include/86box/snd_opl.h b/src/include/86box/snd_opl.h
index 2dc8f4339..eacd09e2c 100644
--- a/src/include/86box/snd_opl.h
+++ b/src/include/86box/snd_opl.h
@@ -38,7 +38,11 @@ typedef struct fm_drv_t {
     void     (*reset_buffer)(void *priv);
     void     (*set_do_cycles)(void *priv, int8_t do_cycles);
     void      *priv;
+<<<<<<< HEAD
     void      (*generate)(void *priv, int32_t *data, uint32_t num_samples); /* daughterboard only. */
+=======
+    void     (*generate)(void *priv, int32_t *data, uint32_t num_samples); /* daughterboard only. */
+>>>>>>> 2b4f7733811f8b79197d2b44a0ff7ba2553d68c9
 } fm_drv_t;
 
 extern uint8_t fm_driver_get(int chip_id, fm_drv_t *drv);