AdBanner reopen new banner and delete. Rename title with content editable tag.

app/helpers/application_helper.rb

@@ -172,11 +172,10 @@ module ApplicationHelper
     locale.to_sym == I18n.locale ? 'active in': ''
   end
 
-<<<<<<< HEAD
-    def at_least_module_manager
+  def at_least_module_manager
       is_manager? || is_admin? 
-    end
-=======
+  end
+  
   def dislpay_view_count(object)
     "#{t(:view_count)}: #{object.view_count}"
   end