merging todo types
fixing a bug