diff --git a/projects/shaoshengsong/imports.yml b/projects/shaoshengsong/imports.yml
index a6fe9e7a08a466061699b2d7ee3b24ee1f06775a..e9b7eba603c48d59c892c2229a34607cf7150fd8 100644
--- a/projects/shaoshengsong/imports.yml
+++ b/projects/shaoshengsong/imports.yml
@@ -33,7 +33,4 @@ group:
   - description: ''
     mirrorRelease: false
     name: YOLOv5-Tools
-    topic: ''
-  
-=======
->>>>>>> projects/shaoshengsong/imports.yml
+    topic: ''
\ No newline at end of file