fix merge conflicts

tbl_change.php

@@ -542,6 +542,7 @@ foreach ($rows as $row_id => $vrow) {
 
                 if ($field['True_Type'] == 'timestamp'
                   && empty($field['Default'])
+                  && empty($data)
                   && ! isset($analyzed_sql[0]['create_table_fields'][$field['Field']]['on_update_current_timestamp'])) {
                     $default_function = $cfg['DefaultFunctions']['first_timestamp'];
                 }