diff --git a/services/JiShe.CollectBus.Application/Samples/SampleAppService.cs b/services/JiShe.CollectBus.Application/Samples/SampleAppService.cs
index e5a7b81..61ba9ce 100644
--- a/services/JiShe.CollectBus.Application/Samples/SampleAppService.cs
+++ b/services/JiShe.CollectBus.Application/Samples/SampleAppService.cs
@@ -26,11 +26,6 @@ using System.Diagnostics;
 using JiShe.CollectBus.IoTDB.Context;
 using JiShe.CollectBus.IoTDB.Interface;
 using JiShe.CollectBus.IoTDB.Options;
-<<<<<<< HEAD
-using JiShe.CollectBus.Kafka.Internal;
-=======
-using JiShe.CollectBus.Common.Extensions;
->>>>>>> fe51402b1f105dc536f08ec2249d4ab13fa8f172
 
 namespace JiShe.CollectBus.Samples;