fix previous merge mistakes