fix conflit

app/assets/javascripts/application.js

@@ -25,6 +25,9 @@
 //= require moment
 //= require daterangepicker
 //= require select2
+//= require bootstrap-datetimepicker
+//= require pickers
+
 
 $(document).on('turbolinks:load', function() {
   $('.datepicker').datepicker({

app/assets/javascripts/origami.js

@@ -6,6 +6,7 @@
 //= require cable
 //= require jquery-ui
 //= require bootstrap-datepicker
+//= require jquery.datetimepicker
 
 $(document).ready(function(){
 	// auto refresh every 60 seconds