added todo
fixed merge conflict