diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
index 53cc5f3d1..dcd3de045 100644
--- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
+++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
@@ -151,6 +151,7 @@ class Panel::Announcement::BackEnd::BulletinsController < ApplicationController
     elsif is_sub_manager?
       @bulletin_categorys = BulletinCategory.authed_for_user(current_user,'submit_new')
     end
+<<<<<<< HEAD
   end
 
   def get_sorted_bulletins
@@ -195,6 +196,8 @@ class Panel::Announcement::BackEnd::BulletinsController < ApplicationController
         a.flatten!
         a.uniq
      end
+=======
+>>>>>>> 26cd6951dba43b1f6eaf5056160309c5c77a8716
   end