add todo project
fix conflict