add todo list
...
resolve conflicts