diff --git a/projects/jeremylong/imports.yml b/projects/jeremylong/imports.yml
index 3b9fd9d029facc65f39cd8d34f2817e9c4a2d4ff..2038d57dcc95b4fd396cd7b07ba3b45bb5706c97 100644
--- a/projects/jeremylong/imports.yml
+++ b/projects/jeremylong/imports.yml
@@ -1,26 +1,10 @@
-<<<<<<< HEAD
 ---
 group:
   name: 'jeremylong'
   description: ''
   projects:
-  - name: 'DependencyCheck'
-    description: ''
-    mirrorRelease: false
-    topic: '' 
-=======
----
-group:
-  name: 'jeremylong'
-  description: ''
-  projects:
-  - name: 'DependencyCheck'
-    description: ''
-    mirrorRelease: false
-    topic: ''
   - name: 'DependencyCheck'
     description: ''
     mirrorRelease: false
     topic: ''
->>>>>>> master
   
\ No newline at end of file