diff --git a/services/JiShe.CollectBus.Application/ScheduledMeterReading/BasicScheduledMeterReadingService.cs b/services/JiShe.CollectBus.Application/ScheduledMeterReading/BasicScheduledMeterReadingService.cs
index 1ab07bc..1cc3c2b 100644
--- a/services/JiShe.CollectBus.Application/ScheduledMeterReading/BasicScheduledMeterReadingService.cs
+++ b/services/JiShe.CollectBus.Application/ScheduledMeterReading/BasicScheduledMeterReadingService.cs
@@ -27,11 +27,6 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using static FreeSql.Internal.GlobalFilter;
-<<<<<<< HEAD
-using JiShe.CollectBus.Kafka.Internal;
-=======
-using static System.Runtime.InteropServices.JavaScript.JSType;
->>>>>>> fe51402b1f105dc536f08ec2249d4ab13fa8f172
 
 namespace JiShe.CollectBus.ScheduledMeterReading
 {