Fixed the datepicker
Fixed merge conflict