fix conflicts and datepicker issue