restore changes lost during previous merge