Fix build after bad merge