resolved merge conflicts with master

src/imbalance_store.cpp

@@ -1,6 +1,7 @@
+// clang-format off
 /* ----------------------------------------------------------------------
    LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator
-   https://lammps.sandia.gov/, Sandia National Laboratories
+   https://www.lammps.org/, Sandia National Laboratories
    Steve Plimpton, sjplimp@sandia.gov
 
    Copyright (2003) Sandia Corporation.  Under the terms of Contract
@@ -16,8 +17,6 @@
 #include "atom.h"
 #include "error.h"
 
-#include <cstring>
-
 using namespace LAMMPS_NS;
 
 /* -------------------------------------------------------------------- */
@@ -36,10 +35,7 @@ ImbalanceStore::~ImbalanceStore()
 int ImbalanceStore::options(int narg, char **arg)
 {
   if (narg < 1) error->all(FLERR,"Illegal balance weight command");
-
-  int len = strlen(arg[0]) + 1;
-  name = new char[len];
-  memcpy(name,arg[0],len);
+  name = utils::strdup(arg[0]);
 
   return 1;
 }