interactive tutorial
fix merge conflicts