added resolve alias. Fixed safe_import bug.