diff --git a/deepmd/pt/utils/stat.py b/deepmd/pt/utils/stat.py
index 8ec8f7a5cb..173e8b4528 100644
--- a/deepmd/pt/utils/stat.py
+++ b/deepmd/pt/utils/stat.py
@@ -8,11 +8,18 @@
     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,
 )