Fixing demo merge