fix duplicate functions from previous merge