Fix import conflict regression