diff --git a/libs/ardour/ardour/audioengine.h b/libs/ardour/ardour/audioengine.h
index 948cf8bb10..d609a4df71 100644
--- a/libs/ardour/ardour/audioengine.h
+++ b/libs/ardour/ardour/audioengine.h
@@ -79,7 +79,6 @@ public:
 
     ProcessThread* main_thread() const { return _main_thread; }
     
-<<<<<<< HEAD
     /* START BACKEND PROXY API 
      *
      * See audio_backend.h for full documentation and semantics. These wrappers