edited the todo list left for us
fixing merge conflicts