correct issue from merge

  void setup_pre_exchange();

  void pre_exchange();

  void pre_neighbor();

  void post_constructor();

  double compute_scalar();

  double compute_vector(int);

  double memory_usage();

  int kspace_flag;              // 1 if KSpace solver defined

  int pending;

  int nimbalance;               // number of imbalance weight computes

  class Imbalance **imbalance;  // list of imbalance compute classes

  class FixStore *imb_fix;      // fix for storing per-atom weights

  class Balance *balance;

  class Irregular *irregular;