From 2d1dd2835ad9d9360376cb28d4e00d97744f94ff Mon Sep 17 00:00:00 2001
From: Jude Nelson <judecn@gmail.com>
Date: Tue, 27 Apr 2021 21:56:56 -0400
Subject: [PATCH] fix merge artifacts, again

---
 testnet/stacks-node/src/run_loop/neon.rs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/testnet/stacks-node/src/run_loop/neon.rs b/testnet/stacks-node/src/run_loop/neon.rs
index fe85d0407..ea2029c35 100644
--- a/testnet/stacks-node/src/run_loop/neon.rs
+++ b/testnet/stacks-node/src/run_loop/neon.rs
@@ -1,4 +1,9 @@
 use ctrlc as termination;
+use std::cmp;
+use std::sync::atomic::{AtomicBool, Ordering};
+use std::sync::mpsc::sync_channel;
+use std::sync::Arc;
+use std::thread;
 
 use stacks::burnchains::bitcoin::address::BitcoinAddress;
 use stacks::burnchains::bitcoin::address::BitcoinAddressType;