merge fix

circular import fix