Fix problem introduced by bad merge