add an item in TODO and extend another one.
Merge remote-tracking branch 'origin/master'