diff --git a/include/FxMixer.h b/include/FxMixer.h
index f1ac405d0..be1d2486e 100644
--- a/include/FxMixer.h
+++ b/include/FxMixer.h
@@ -202,13 +202,8 @@ private:
 	void allocateChannelsTo(int num);
 	QMutex m_sendsMutex;
 
-<<<<<<< HEAD
-	void addChannelLeaf( FxChannel * ch, sampleFrame * buf );
-
 	int m_lastSoloed;
 
-=======
->>>>>>> stable-1.1
 	friend class MixerWorkerThread;
 	friend class FxMixerView;