add new edit form and datetimepicker
fix conflict