configure for hyperspace demo
start dummy
merge conflicts solved
Resolve merge conflict with master.