Fix bug causing tutorial to be always present

Change-Id: I374caab857819e390df07f6ce968a5b868f8910f
Consistency fix for merge algorithm usage

Change-Id: Ic931b83332bbca8fc35777e83873706c2bd87cf1