diff --git a/src/runner.c b/src/runner.c
index 72b7e8d15790d6aa5278e3f554cd0509151e6534..bd6919411d7f2560fd211ddd25536b33835d072b 100644
--- a/src/runner.c
+++ b/src/runner.c
@@ -64,11 +64,7 @@
 #include "task.h"
 #include "timers.h"
 #include "timestep.h"
-<<<<<<< HEAD
-#include "tracers.h"
-=======
 #include "starformation.h"
->>>>>>> Remove a few bugs
 
 #define TASK_LOOP_DENSITY 0
 #define TASK_LOOP_GRADIENT 1