updated GPSR based on TC discussions

Author: adamgolding1

tasks/GPSR.tex

@@ -75,7 +75,14 @@ \subsection*{OC Instructions}
 
 \noindent During the test:
 \begin{itemize}[nosep]
+<<<<<<< HEAD
 	\item The arena will be setup for all command executions.
+||||||| parent of 6fdbf23 (updated GPSR based on TC discussions)
+	\item If commands are given one-by-one, restore the arena to its nominal state before each command execution.
+=======
+	\item If all three commands are issued together, the arena will be setup for all command executions. 
+	\item If commands are given one-by-one, restore the arena to its nominal state before each command execution.
+>>>>>>> 6fdbf23 (updated GPSR based on TC discussions)
 \end{itemize}
 
 \subsection*{Score Sheet}