TODO: Report errors back to me
Fixes merge conflicts in TODO.md