Merge upcoming lesson design
Fix conflict