Fix merge conflicts

integration_tests/tests/control_plane/mod.rs

@@ -95,6 +95,12 @@ impl StorageControlPlane {
         cplane
     }
 
+	pub fn stop(&self) {
+        for wa in self.wal_acceptors.iter() {
+			wa.stop();
+		}
+	}
+
     // // postgres <-> wal_acceptor x3 <-> page_server
     // fn local(&mut self) -> StorageControlPlane {
     // }
@@ -128,6 +134,13 @@ impl StorageControlPlane {
     }
 }
 
+impl Drop for StorageControlPlane {
+    fn drop(&mut self) {
+		self.stop();
+	}
+}
+
+
 pub struct PageServerNode {
     page_service_addr: SocketAddr,
     data_dir: PathBuf,