updated TODO
fixed merge conflict in TODO