Fix wonky imports from merge