diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b9d0aeb..b36f959 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,9 +7,13 @@
+=======
+
+>>>>>>> Stashed changes
@@ -54,17 +58,29 @@
"Cargo.Build `Test chip8::video::test::poke_byte`.executor": "Run",
"Cargo.Build `Test chip8::video::test::scroll_down_1_row_test`.executor": "Run",
"Cargo.Build `Test computer::test`.executor": "Run",
+<<<<<<< Updated upstream
"Cargo.Build `Test instructions::test (1)`.executor": "Run",
"Cargo.Build `Test instructions::test`.executor": "Run",
"Cargo.Build `Test video::test`.executor": "Run",
"Cargo.Build gemma.executor": "Run",
"Cargo.Run ch8asm.executor": "Run",
+=======
+ "Cargo.Build `Test computer_dump_registers_to_string`.executor": "Run",
+ "Cargo.Build `Test instructions::test (1)`.executor": "Run",
+ "Cargo.Build `Test instructions::test`.executor": "Run",
+ "Cargo.Build `Test instructions_name_tests`.executor": "Run",
+ "Cargo.Build `Test video::test`.executor": "Run",
+ "Cargo.Build gemma.executor": "Run",
+>>>>>>> Stashed changes
"Cargo.Run emmagui.executor": "Run",
"Cargo.Run gemmaegui.executor": "Debug",
"Cargo.Run gemmaegui_viewer.executor": "Debug",
"Cargo.Run gemmaimgui.executor": "Debug",
"Cargo.Run trevors_chip8_toy.executor": "Debug",
+<<<<<<< Updated upstream
"Cargo.Test ch8asm::test.executor": "Debug",
+=======
+>>>>>>> Stashed changes
"Cargo.Test chip8::computer::test::cls_test.executor": "Run",
"Cargo.Test chip8::computer::test::decoder_test_valid_instructions.executor": "Run",
"Cargo.Test chip8::instructions::test::LdStVx_test.executor": "Run",
@@ -93,9 +109,17 @@
"Cargo.Test chip8::video::test::scroll_down_1_row_test.executor": "Run",
"Cargo.Test chip8::video::test::write_checkboard.executor": "Run",
"Cargo.Test computer::test.executor": "Debug",
+<<<<<<< Updated upstream
"Cargo.Test instruction_tests.executor": "Run",
"Cargo.Test instructions::test (1).executor": "Debug",
"Cargo.Test instructions::test.executor": "Debug",
+=======
+ "Cargo.Test computer_dump_registers_to_string.executor": "Run",
+ "Cargo.Test encode_decode_name_test.executor": "Debug",
+ "Cargo.Test instructions::test (1).executor": "Debug",
+ "Cargo.Test instructions::test.executor": "Debug",
+ "Cargo.Test instructions_name_tests.executor": "Run",
+>>>>>>> Stashed changes
"Cargo.Test sound_timer::test.executor": "Run",
"Cargo.Test util::test.executor": "Run",
"Cargo.Test video::test.executor": "Debug",
@@ -258,9 +282,14 @@