Add today's dinner
Fix Conflict