Add thyme to the chili recipe
Fixed conflict