Removing extra code introduced by previous merge commit