diff --git a/includes/delete_datastream.form.inc b/includes/delete_datastream.form.inc
index 356b7175..14bb8ebe 100644
--- a/includes/delete_datastream.form.inc
+++ b/includes/delete_datastream.form.inc
@@ -19,22 +19,21 @@
  *   The drupal form definition.
  */
 function islandora_delete_datastream_form(array $form, array &$form_state, AbstractDatastream $datastream) {
+  // XXX: Stashed version of datastream is deprecated... Use object and
+  // datastream IDs from 'datastream_info' to acquire.
   $form_state['datastream'] = $datastream;
-<<<<<<< HEAD
   $form_state['datastream_info'] = array(
     'object_id' => $datastream->parent->id,
     'datastream_id' => $datastream->id,
   );
-=======
->>>>>>> 4b477a3... Fixing derivatives hook spelling error
   $object = $datastream->parent;
   $dsid = $datastream->id;
-  $derivs = implode(', ', islandora_datastream_to_purge($object, $dsid));
+  $dsids = array_merge(array($dsid), islandora_datastream_to_purge($object, $dsid));
+  $dsids = array_unique($dsids);
   $form['delete_derivatives'] = array(
     '#title' => t('Delete Derivatives'),
     '#type' => 'checkbox',
     '#default_value' => 0,
-<<<<<<< HEAD
         '#description' => t('Derivatives can be regenerated at a later time.'),
   );
   $form['base_info'] = array(
@@ -57,9 +56,6 @@ function islandora_delete_datastream_form(array $form, array &$form_state, Abstr
         ':input[name="delete_derivatives"]' => array('checked' => TRUE),
       ),
     ),
-=======
-    '#description' => t('Derivatives can be regenerated at a later time. <p><strong>Datastream(s) to be purged: </strong></p>@dsid, @derivs', array('@dsid' => $datastream->id, '@derivs' => $derivs)),
->>>>>>> 4b477a3... Fixing derivatives hook spelling error
   );
   return confirm_form($form,
     t('Are you sure you want to delete the %dsid datastream?', array('%dsid' => $datastream->id)),
@@ -119,15 +115,9 @@ function islandora_datastream_derivatives_purged(AbstractObject $object, $dsid)
  *   The Drupal form state.
  */
 function islandora_delete_datastream_form_submit(array $form, array &$form_state) {
-<<<<<<< HEAD
   $object = islandora_object_load($form_state['datastream_info']['object_id']);
   $datastream_id = $form_state['datastream_info']['datastream_id'];
   $datastream = $object[$datastream_id];
-=======
-  $datastream = $form_state['datastream'];
-  $datastream_id = $datastream->id;
-  $object = $datastream->parent;
->>>>>>> 4b477a3... Fixing derivatives hook spelling error
   $deleted = FALSE;
   if ($form_state['values']['delete_derivatives']) {
     islandora_datastream_derivatives_purged($object, $datastream_id);
diff --git a/islandora.module b/islandora.module
index 4eb5af9d..8c579041 100644
--- a/islandora.module
+++ b/islandora.module
@@ -59,25 +59,10 @@ 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
-<<<<<<< HEAD
-<<<<<<< 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.
-=======
-// ISLANDORA_DERVIATIVE_CREATION_HOOK is deprecated. Should be removed
-// as of 7.x-1.5.
->>>>>>> parent of 62860db... Adding changes.
 define('ISLANDORA_DERVIATIVE_CREATION_HOOK', ISLANDORA_DERIVATIVE_CREATION_HOOK);
 
-=======
->>>>>>> 4b477a3... Fixing derivatives hook spelling error
-=======
->>>>>>> 4b477a3... Fixing derivatives hook spelling error
 
 // Autocomplete paths.
 define('ISLANDORA_CONTENT_MODELS_AUTOCOMPLETE', 'islandora/autocomplete/content-models');