diff --git a/guided_mrmp/planners/multirobot/db_guided_mrmp.py b/guided_mrmp/planners/multirobot/db_guided_mrmp.py
index c13897715dca4c0c0bdafbd57abd0657ac4c2930..fec2c2e6b9d1df7ccdb38d8a0619cccbbd332a8b 100644
--- a/guided_mrmp/planners/multirobot/db_guided_mrmp.py
+++ b/guided_mrmp/planners/multirobot/db_guided_mrmp.py
@@ -85,7 +85,7 @@ class GuidedMRMP:
 
         return trajectory
     
-    def find_all_conflicts(self, desired_controls, desired_trajs, dt):
+    def find_all_conflicts(self, desired_trajs, dt):
         """
         Check for any conflicts that will occur between robots in the next time horizon
         """
@@ -174,8 +174,8 @@ class GuidedMRMP:
         # get the next control for each robot
         next_desired_controls, trajectories = self.get_next_controls_and_trajectories(screen)
 
-        # find all the conflicts at the next timestep
-        conflicts = self.find_all_conflicts(next_desired_controls, trajectories, dt)
+        # find all the conflicts at the next time horizon
+        conflicts = self.find_all_conflicts(trajectories, dt)
 
         # resolve the conflicts using the database
         # resolver = TrajOptDBResolver(10, 60, conflicts, self.robots)