diff --git a/10.03_app_demo/2_src/menu_devices.cpp b/10.03_app_demo/2_src/menu_devices.cpp
index 7ddbcfd..c855121 100644
--- a/10.03_app_demo/2_src/menu_devices.cpp
+++ b/10.03_app_demo/2_src/menu_devices.cpp
@@ -176,7 +176,6 @@ void application_c::menu_devices(bool with_CPU) {
 
 	// now devices are "Plugged in". Reset PDP-11.
 	unibus->powercycle();
->>>>>>> upstream/master
 
 	while (!ready) {