diff --git a/taxonomy_manager.admin.inc b/taxonomy_manager.admin.inc
index d768cc9..d65fe34 100644
--- a/taxonomy_manager.admin.inc
+++ b/taxonomy_manager.admin.inc
@@ -610,13 +610,8 @@ function taxonomy_manager_term_merge_form(&$form, $voc) {
     '#autocomplete_path' => 'taxonomy_manager/autocomplete/' . $voc->vid,
   );
 
-  $form['term_merge']['options'] = array(
-    '#type' => 'checkboxes',
-    '#title' => t('Options'),
-    '#options' => array(
-      'keep_merged' => t('Keep merged terms'),
-    ),
-  );
+  // We should use the full options provided from the term_merge module
+  $form['term_merge'] += term_merge_merge_options_elements($form['voc']['#value']);
 
   $form['term_merge']['submit'] = array(
     '#type' => 'submit',
@@ -1605,7 +1600,15 @@ function taxonomy_manager_form_term_merge_submit($form, $form_state) {
   }
   $term_names = implode($term_names_array, ', ');
   if (module_exists('term_merge')) {
-    term_merge($selected_tids, $dest_term->tid, $form_state['values']['term_merge']['options']['keep_merged']);
+    $merge_settings = array(
+      'term_branch_keep' => (bool) $form_state['values']['term_merge']['term_branch_keep'],
+      'merge_fields' => array_values(array_filter($form_state['values']['term_merge']['merge_fields'])),
+      'keep_only_unique' => (bool) $form_state['values']['term_merge']['keep_only_unique'],
+      'redirect' => isset($form_state['values']['term_merge']['redirect']) ? $form_state['values']['term_merge']['redirect'] : TERM_MERGE_NO_REDIRECT,
+      'synonyms' => isset($form_state['values']['term_merge']['synonyms']) ? array_values(array_filter($form_state['values']['term_merge']['synonyms'])) : array(),
+      'step' => (int) $form_state['values']['term_merge']['step'],
+    );
+    term_merge($selected_tids, $dest_term->tid, $merge_settings);
     drupal_set_message(t("Terms %term_names merged into %dest_term", array('%term_names' => $term_names, '%dest_term' => $dest_term->name)));
   }
   else {