Resolves compilation errors caused by previous merge