New Todo button adds text field
fix merge conflict