clean from previous merge