fix config and previous merge