update checklist
merge