diff --git a/tests/NetAudio/ITANetAudioStreamingServerTest b/tests/NetAudio/ITANetAudioStreamingServerTest
deleted file mode 100755
index 09295672536c6996b2da4824a50166a78f1279ba..0000000000000000000000000000000000000000
Binary files a/tests/NetAudio/ITANetAudioStreamingServerTest and /dev/null differ
diff --git a/tests/NetAudio/ITANetAudioStreamingServerTest.cpp b/tests/NetAudio/ITANetAudioStreamingServerTest.cpp
index 53e91e1651e98d960fd45678851d455dc3f19ffb..0fd54c66a5eebe1889bfcc1385b42eddf50a2f27 100644
--- a/tests/NetAudio/ITANetAudioStreamingServerTest.cpp
+++ b/tests/NetAudio/ITANetAudioStreamingServerTest.cpp
@@ -5,12 +5,8 @@
 #include <ITANetAudioServer.h>
 #include <ITAStreamFunctionGenerator.h>
 #include <ITAStreamMultiplier1N.h>
-<<<<<<< HEAD
 #include <ITAFileDataSource.h>
-=======
-#include <ITAFileDatasource.h>
-#include <VistaBase\VistaTimeUtils.h>
->>>>>>> 8eb8596629ad0642aaaec5a68bf1554216289863
+#include <VistaBase/VistaTimeUtils.h>
 
 using namespace std;