diff --git a/source/ch-coding.ptx b/source/ch-coding.ptx
index 6cfde0f..bcd74e9 100644
--- a/source/ch-coding.ptx
+++ b/source/ch-coding.ptx
@@ -158,16 +158,38 @@ Unless your Codespace has been customized via a
into here), you'll be using the default Codespace
image provided by GitHub. This environment is ready
to execute code from various standard programming
+<<<<<<< Updated upstream
lanugages, though for some of them you may
need to run the script using the Terminal.
+=======
+lanugages, though for something of them you may
+need to run the script using the Terminal
.
+>>>>>>> Stashed changes
+A
+To open a terminal on demand in a Codespace, use the shortcut +Ctrl/Cmd+Shift+`. +
+
What do you think the programs in
To spin up your live preview, open a terminal by using the
-Ctrl/Cmd+Shift+` keys. To make
+shortcut noted in