diff --git a/lib/noosfero/plugin/settings.rb b/lib/noosfero/plugin/settings.rb
index 81b8d6b..ab6f8e7 100644
--- a/lib/noosfero/plugin/settings.rb
+++ b/lib/noosfero/plugin/settings.rb
@@ -38,11 +38,7 @@ class Noosfero::Plugin::Settings
   end
 
   def save!
-<<<<<<< HEAD
-    @environment.save!
-=======
     @base.save!
->>>>>>> merge-requests/248
   end
 
 end
--
libgit2 0.21.2