merge TODO.org from working copy 0.0.x