created a todo list
resolving conflicts