Resolve ToDoListNew conflict