Fix imports from merge