Complete warmup
Fix merge conflicts