fix demo up to step 3
preempt merge conflict