diff --git a/.gitignore b/.gitignore
index 5c9d7b01..ff274d41 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,5 +21,9 @@ dist/
 # Hidden files
 .*
 
+<<<<<<< Updated upstream
 # Jupyter notebook checkpoints
 .ipynb_checkpoints/
+=======
+*.out
+>>>>>>> Stashed changes
diff --git a/docs/source/python_scripting.rst b/docs/source/python_scripting.rst
index 4698d2ac..6fb3cf98 100644
--- a/docs/source/python_scripting.rst
+++ b/docs/source/python_scripting.rst
@@ -33,7 +33,7 @@ To make it easier to create commands within a block of Python code, there is a b
     #python:
     from gprMax.input_cmd_funcs import *
     domain = domain(0.2, 0.2, 0.2)
-    for x in range(0, 8)
+    for x in range(0, 8):
         cylinder(0.02 + x * 0.02, 0.05, 0, 0.020 + x * 0.02, 0.05, domain[2], 0.005, 'pec’)
     #end_python: