diff --git a/libs/backends/wavesaudio/portmidi/src/porttime/ptwinmm.c b/libs/backends/wavesaudio/portmidi/src/porttime/ptwinmm.c
index 2021a13eee..af4034c7cc 100644
--- a/libs/backends/wavesaudio/portmidi/src/porttime/ptwinmm.c
+++ b/libs/backends/wavesaudio/portmidi/src/porttime/ptwinmm.c
@@ -2,15 +2,10 @@
 
 
 #include "porttime.h"
-<<<<<<< HEAD
-#include "windows.h"
-#include "time.h"
-=======
+
 #include <windows.h>
 #include <mmsystem.h>
 #include <time.h>
->>>>>>> 41fe637... Add the 'porttime' source file for Windows
-
 
 TIMECAPS caps;