Interactive challenges
Fixed merge conflicts