added garlic powder to chili recipe
resolved conflicts