diff --git a/islandora.info b/islandora.info
index 75147143..e06d0de9 100644
--- a/islandora.info
+++ b/islandora.info
@@ -22,9 +22,6 @@ files[] = tests/islandora_manage_permissions.test
 files[] = tests/datastream_versions.test
 files[] = tests/datastream_cache.test
 files[] = tests/derivatives.test
-<<<<<<< HEAD
 files[] = tests/islandora_manage_temp_file.test
-=======
 files[] = tests/datastream_validator_tests.test
->>>>>>> 6c3fcb0381318857b6c2aa7f9059f939ab7ecef5
 php = 5.3