diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
index bbf35196..751a5f12 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
@@ -141,7 +141,6 @@
 	  });
 	</script>
 <% end %>
-<<<<<<< HEAD
 
 <!--Widget start-->
 <!-- <div id="sub-wiget">
@@ -530,5 +529,3 @@
     <button class="btn btn-primary" type="submit">Submit/送出</button>
     <button class="btn" type="reset">Cancel/取消</button>
 <!-- </div> -->
-=======
->>>>>>> Fix bugs and changes for nccu