Fixed more merge errors
Fixed merge conflict in datetimepicker.js