fixing last merge conflict remnants

Author: anyaevostinar

source/sgp_mode/ProgramBuilder.h

@@ -230,10 +230,6 @@ class ProgramBuilder {
     // nand r1, r1, r1
     // nand r0, r1, r0
     // nand r0, r0, r0
-<<<<<<< HEAD
-=======
-
->>>>>>> ff4400a9eb15a1fdbd0e686ccd216c215f1add71
     AddInst(program, nand_op, 0, 0, 0);
     AddInst(program, nand_op, 1, 1, 1);
     AddInst(program, nand_op, 0, 1, 0);

source/sgp_mode/SGPWorld.h

@@ -384,7 +384,6 @@ class SGPWorld : public SymWorld {
   ReproductionQueue repro_queue; // Stores which organisms are queued for reproduction
   tasks::LogicTaskEnvironment task_env;   // Manages task set, task requirements, and task rewards
   event_manager_t event_manager;
-  mutator_t mutator;  // Handles mutating sgp programs
   // TODO - Consider having symbiont rectifier and host rectifier
   //        -> Symbiont-specific instructions wouldn't be in host's instruction set
   sgp_prog_rectifier_t opcode_rectifier; // Used to "disable" instructions at runtime based on run configuration