diff --git a/deepmd/pt/utils/stat.py b/deepmd/pt/utils/stat.py
index 173e8b4528..b73ecca229 100644
--- a/deepmd/pt/utils/stat.py
+++ b/deepmd/pt/utils/stat.py
@@ -1,5 +1,7 @@
 # SPDX-License-Identifier: LGPL-3.0-or-later
 import logging
+import numpy as np
+import torch
 from collections import (
     defaultdict,
 )
@@ -8,18 +10,11 @@
     Optional,
     Union,
 )
-<<<<<<< HEAD
 import numpy as np
 import torch
 from deepmd.dpmodel.output_def import (
     FittingOutputDef,
 )
-=======
-
-import numpy as np
-import torch
-
->>>>>>> 83b7f1d894ade4452454f51e67ffee86160a71f0
 from deepmd.pt.utils import (
     AtomExcludeMask,
 )