Fixed merge conflict in demo2.
Fixed merge conflict in demo2.

Fixed an unnoticed merge conflit that occured in demo2.py.
How2Compute/SmartHome,How2Compute/SmartHome,How2Compute/SmartHome,How2Compute/SmartHome