diff --git a/user/tools/symbols.rst b/user/tools/symbols.rst
index f4a95ff..91ba077 100644
--- a/user/tools/symbols.rst
+++ b/user/tools/symbols.rst
@@ -132,11 +132,7 @@ Examples
 --------
 
 Create a dynamlically loaded symbol table for the ``minimum.exe`` sample
-<<<<<<< Updated upstream
 program for the ``i386/pc686`` BSP:
-=======
-program for the ``i386/pc686``:
->>>>>>> Stashed changes
 
 .. code-block:: shell