diff --git a/islandora.module b/islandora.module
index 8c579041..fa262fa3 100644
--- a/islandora.module
+++ b/islandora.module
@@ -59,8 +59,13 @@ define('ISLANDORA_DATASTREAM_MODIFIED_HOOK', 'islandora_datastream_modified');
 define('ISLANDORA_DATASTREAM_PURGED_HOOK', 'islandora_datastream_purged');
 define('ISLANDORA_INGEST_STEP_HOOK', 'islandora_ingest_steps');
 define('ISLANDORA_DERIVATIVE_CREATION_HOOK', 'islandora_derivative');
+<<<<<<< HEAD
 // The "ISLANDORA_DERVIATIVE_CREATION_HOOK" constant has deprecated as of
 // 7.x-1.5, and should be removed after the next release.
+=======
+// ISLANDORA_DERVIATIVE_CREATION_HOOK is deprecated. Should be removed
+// as of 7.x-1.5.
+>>>>>>> parent of a7a98a1... Adding changes.
 define('ISLANDORA_DERVIATIVE_CREATION_HOOK', ISLANDORA_DERIVATIVE_CREATION_HOOK);