diff --git a/source/extensions/omni.isaac.lab/docs/CHANGELOG.rst b/source/extensions/omni.isaac.lab/docs/CHANGELOG.rst
index 126f16c249..2f8ce741d9 100644
--- a/source/extensions/omni.isaac.lab/docs/CHANGELOG.rst
+++ b/source/extensions/omni.isaac.lab/docs/CHANGELOG.rst
@@ -109,11 +109,6 @@ Added
 Added
 ^^^^^
 
-<<<<<<< HEAD
-* Added wrappers to enable TorchRL training workflow.
-* Added PPO Runner and configuration for TorchRL.
-* Added ``torchrl`` as `setup.py` required dependency.
-=======
 * Added action clip to all :class:`omni.isaac.lab.envs.mdp.actions`.
 
 
@@ -480,7 +475,6 @@ Fixed
 
 * Fixed the :meth:`omni.isaac.lab.envs.mdp.events.randomize_rigid_body_material` function to
   correctly sample friction and restitution from the given ranges.
->>>>>>> main
 
 
 0.24.19 (2024-10-05)
diff --git a/source/extensions/omni.isaac.lab_tasks/setup.py b/source/extensions/omni.isaac.lab_tasks/setup.py
index 66f8326956..00bbdb0949 100644
--- a/source/extensions/omni.isaac.lab_tasks/setup.py
+++ b/source/extensions/omni.isaac.lab_tasks/setup.py
@@ -44,6 +44,7 @@
     "skrl": ["skrl>=1.3.0"],
     "rl-games": ["rl-games==1.6.1", "gym"],  # rl-games still needs gym :(
     "rsl-rl": ["rsl-rl@git+https://github.com/leggedrobotics/rsl_rl.git"],
+    "robomimic": [],
     "torchrl": ["torchrl==0.5"],
 }
 # Add the names with hyphens as aliases for convenience