[Tutti-commits] 10/11: Fix import from merge