fix errors in tutorial + bonus DRY prompt
fix merge conflict