diff --git a/src/Editor/GetPointServices.ts b/src/Editor/GetPointServices.ts
index 83da00a95..26acc353e 100644
--- a/src/Editor/GetPointServices.ts
+++ b/src/Editor/GetPointServices.ts
@@ -59,14 +59,11 @@ export class GetPointServices
                             app.m_Viewer.WorldToScreen(endP);
                             preView.ScreenPointToViewerPoint(endP);
 
-<<<<<<< HEAD
-=======
                             let startP = prompt.BasePoint.clone();
                             app.m_Viewer.WorldToScreen(startP);
                             preView.ScreenPointToViewerPoint(startP);
 
                             geo.vertices[0] = startP;
->>>>>>> master
                             geo.vertices[1] = endP;
                             geo.computeLineDistances();
                             geo.lineDistancesNeedUpdate = true;
@@ -256,8 +253,6 @@ export class GetPointServices
                     this.DrawLine(insD.i1.basePt, insD.ins, preView.m_BlueDashMaterial);
                     this.DrawLine(insD.i2.basePt, insD.ins, preView.m_BlueDashMaterial);
 
-<<<<<<< HEAD
-=======
 
                     //绘制捕捉光标列表
                     for (let snapP of this.m_SnapPtList)
@@ -282,7 +277,6 @@ export class GetPointServices
                         }
                     }
 
->>>>>>> master
                     return insD.ins.clone();
                 }
             }