Adding retro questions for today
Fixing merge