change datepicker on checklist
fix conflict in PR edit