Fix merge conflict

js/tbl_change.js

@@ -484,7 +484,7 @@ AJAX.registerOnload('tbl_change.js', function () {
                 // update the IDs of textfields to ensure that they are unique
                 $(this).attr('id', "field_" + tabindex + "_3");
             });
-            $('select.control_at_footer')
+            $('.control_at_footer')
             .each(function () {
                 tabindex++;
                 $(this).attr('tabindex', tabindex);

libraries/insert_edit.lib.php

@@ -1527,7 +1527,7 @@ function PMA_getSubmitTypeDropDown($where_clause, $tabindex, $tabindex_for_value
  */
 function PMA_getAfterInsertDropDown($where_clause, $after_insert, $found_unique_key)
 {
-    $html_output = '<select name="after_insert">'
+    $html_output = '<select name="after_insert" class="control_at_footer">'
         . '<option value="back" '
         . ($after_insert == 'back' ? 'selected="selected"' : '') . '>'
         . __('Go back to previous page') . '</option>'