fix merge conflits

Author: rrennick

src/Controllers/Version2/class-wc-rest-system-status-tools-v2-controller.php

@@ -583,6 +583,20 @@ public function execute_tool( $tool ) {
 					$message = __( 'Template cache cleared.', 'woocommerce-rest-api' );
 				} else {
 					$message = __( 'The active version of WooCommerce does not support template cache clearing.', 'woocommerce-rest-api' );
+			case 'verify_db_tables':
+				if ( ! method_exists( 'WC_Install', 'verify_base_tables' ) ) {
+					$message = __( 'You need WooCommerce 4.2 or newer to run this tool.', 'woocommerce-rest-api' );
+					$ran = false;
+					break;
+				}
+				// Try to manually create table again.
+				$missing_tables = WC_Install::verify_base_tables( true, true );
+				if ( 0 === count( $missing_tables ) ) {
+					$message = __( 'Database verified successfully.', 'woocommerce-rest-api' );
+				} else {
+					$message = __( 'Verifying database... One or more tables are still missing: ', 'woocommerce-rest-api' );
+					$message .= implode( ', ', $missing_tables );
+					$ran = false;
 				}
 				break;