Merge ToDo edit and view states