Add missing import from merge