removing garbage of previous merge