diff --git a/rqt_joint_trajectory_controller/rqt_joint_trajectory_controller/joint_trajectory_controller.py b/rqt_joint_trajectory_controller/rqt_joint_trajectory_controller/joint_trajectory_controller.py
index 72c11625e4..547fcb6a25 100644
--- a/rqt_joint_trajectory_controller/rqt_joint_trajectory_controller/joint_trajectory_controller.py
+++ b/rqt_joint_trajectory_controller/rqt_joint_trajectory_controller/joint_trajectory_controller.py
@@ -238,7 +238,15 @@ def _update_jtc_list(self):
         # for _all_ their joints
         running_jtc = self._running_jtc_info()
         if running_jtc and not self._robot_joint_limits:
+<<<<<<< HEAD
             self._robot_joint_limits = get_joint_limits(self._node)  # Lazy evaluation
+=======
+            self._robot_joint_limits = {}
+            for jtc_info in running_jtc:
+                self._robot_joint_limits.update(
+                    get_joint_limits(self._node, _jtc_joint_names(jtc_info))
+                )
+>>>>>>> 3be3fe9 (Fix bug for displaying all controllers (#1259))
         valid_jtc = []
         if self._robot_joint_limits:
             for jtc_info in running_jtc: