clear code from previous merge trash