add todos and database version number
merging