diff --git a/plugins/bitcrush/Makefile b/plugins/bitcrush/Makefile
index 731bb78..ffa5d81 100644
--- a/plugins/bitcrush/Makefile
+++ b/plugins/bitcrush/Makefile
@@ -28,27 +28,13 @@ BUILD_CXX_FLAGS += -I../common -I../common/gen_dsp
 # --------------------------------------------------------------
 # Enable all possible plugin types
 
-ifeq ($(BUILD_JACK),true)
 ifeq ($(HAVE_JACK),true)
 TARGETS += jack
 endif
-endif
 
-<<<<<<< HEAD
-TARGETS += ladspa
-=======
-ifeq ($(BUILD_LADSPA),true)
 TARGETS += ladspa
-endif
-
-ifeq ($(BUILD_LV2),true)
->>>>>>> 32c2796b78396662fcc5bfce3bd6a02e8958a44a
 TARGETS += lv2_dsp
-endif
-
-ifeq ($(BUILD_VST2),true)
 TARGETS += vst
-endif
 
 all: $(TARGETS)
 
diff --git a/plugins/freeverb/Makefile b/plugins/freeverb/Makefile
index b406bdb..4d3830d 100644
--- a/plugins/freeverb/Makefile
+++ b/plugins/freeverb/Makefile
@@ -28,27 +28,13 @@ BUILD_CXX_FLAGS += -I../common -I../common/gen_dsp
 # --------------------------------------------------------------
 # Enable all possible plugin types
 
-ifeq ($(BUILD_JACK),true)
 ifeq ($(HAVE_JACK),true)
 TARGETS += jack
 endif
-endif
 
-<<<<<<< HEAD
-TARGETS += ladspa
-=======
-ifeq ($(BUILD_LADSPA),true)
 TARGETS += ladspa
-endif
-
-ifeq ($(BUILD_LV2),true)
->>>>>>> 32c2796b78396662fcc5bfce3bd6a02e8958a44a
 TARGETS += lv2_dsp
-endif
-
-ifeq ($(BUILD_VST2),true)
 TARGETS += vst
-endif
 
 all: $(TARGETS)
 
diff --git a/plugins/gigaverb/Makefile b/plugins/gigaverb/Makefile
index b32abc8..5cdf142 100644
--- a/plugins/gigaverb/Makefile
+++ b/plugins/gigaverb/Makefile
@@ -28,27 +28,13 @@ BUILD_CXX_FLAGS += -I../common -I../common/gen_dsp
 # --------------------------------------------------------------
 # Enable all possible plugin types
 
-ifeq ($(BUILD_JACK),true)
 ifeq ($(HAVE_JACK),true)
 TARGETS += jack
 endif
-endif
 
-<<<<<<< HEAD
-TARGETS += ladspa
-=======
-ifeq ($(BUILD_LADSPA),true)
 TARGETS += ladspa
-endif
-
-ifeq ($(BUILD_LV2),true)
->>>>>>> 32c2796b78396662fcc5bfce3bd6a02e8958a44a
 TARGETS += lv2_dsp
-endif
-
-ifeq ($(BUILD_VST2),true)
 TARGETS += vst
-endif
 
 all: $(TARGETS)
 
diff --git a/plugins/pitchshift/Makefile b/plugins/pitchshift/Makefile
index 41d1537..65090c2 100644
--- a/plugins/pitchshift/Makefile
+++ b/plugins/pitchshift/Makefile
@@ -28,27 +28,13 @@ BUILD_CXX_FLAGS += -I../common -I../common/gen_dsp
 # --------------------------------------------------------------
 # Enable all possible plugin types
 
-ifeq ($(BUILD_JACK),true)
 ifeq ($(HAVE_JACK),true)
 TARGETS += jack
 endif
-endif
 
-<<<<<<< HEAD
-TARGETS += ladspa
-=======
-ifeq ($(BUILD_LADSPA),true)
 TARGETS += ladspa
-endif
-
-ifeq ($(BUILD_LV2),true)
->>>>>>> 32c2796b78396662fcc5bfce3bd6a02e8958a44a
 TARGETS += lv2_dsp
-endif
-
-ifeq ($(BUILD_VST2),true)
 TARGETS += vst
-endif
 
 all: $(TARGETS)