diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 3630db1..419fd4b 100755
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -12,13 +12,10 @@
 //
 //= require jquery
 //= require jquery_ujs
-<<<<<<< HEAD
-=======
 //= require jquery.ui.all
 // require jquery.ui.draggable
 // require jquery.ui.sortable
 // require jquery.sortable
->>>>>>> bb8f427f953c2bcf84331b4eb1f8b5c7108e80e6
 // require jquery-ui
 //= require_tree .
 //= require tinymce-jquery