restore tests deleted during conflict merge