diff --git a/modules-mls.conf b/modules-mls.conf
index 8b6117ec..d22f31f0 100644
--- a/modules-mls.conf
+++ b/modules-mls.conf
@@ -933,24 +933,6 @@ ntop = module
 nslcd = module
 
 # Layer: apps
-<<<<<<< HEAD
-||||||| merged common ancestors
-# Module: nsplugin
-#
-# Policy for nspluginwrapper 
-# 
-nsplugin = module
-
-# Layer: apps
-=======
-# Module: nsplugin
-#
-# Policy for nspluginwrapper 
-# 
-#nsplugin = module
-
-# Layer: apps
->>>>>>> 51bad8c183c97b813d9b5250ab04c5bb2a3c45f8
 # Module: mplayer
 #
 # Policy for Mozilla and related web browsers