diff --git a/Electrical_inspectionCompetitionSystem/Assets/Resources/New/Models/钳形电流表.prefab b/Electrical_inspectionCompetitionSystem/Assets/Resources/New/Models/钳形电流表.prefab
index 1904547d..f4384d3a 100644
--- a/Electrical_inspectionCompetitionSystem/Assets/Resources/New/Models/钳形电流表.prefab
+++ b/Electrical_inspectionCompetitionSystem/Assets/Resources/New/Models/钳形电流表.prefab
@@ -797,13 +797,8 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5363856005780046791}
-<<<<<<< HEAD
   m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: -0, y: 0, z: 0.25}
-=======
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -6.53, y: 0, z: -12.88}
->>>>>>> f34d66c0c477ff33bfc73b5d5aab2820ef7b0671
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -1015,8 +1010,8 @@ Transform:
   m_GameObject: {fileID: 6158171241742345501}
   m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
   m_LocalPosition: {x: -2.9079998, y: -0.558, z: 2.842}
-  m_LocalScale: {x: 0.02999999, y: 0.029999994, z: 0.029999992}
-  m_ConstrainProportionsScale: 1
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 5141020518187440115}
   m_Father: {fileID: 0}