[Windup-commits] [windup/windup] f331db: Fix issue introduced by merge conflict