Add ToDoList + Correct merge conflict style.css